summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-11-05 18:55:07 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-11-05 18:55:07 -0800
commit7bb59519636a7e0028e6f0f63d8256a68a24792d (patch)
treee3434d62ebeb985645eb7a917f9ce563a1250266
parent898dfc9ce731ea9515f7819a9f0583af81d7d8b2 (diff)
Remove checks for Solaris x86 versions older than Solaris 8
-rw-r--r--src/sun_mouse.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index 79a06d4..4913942 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -59,9 +59,6 @@
#include "xf86.h"
#include "xf86_OSlib.h"
#include "xf86OSmouse.h"
-
-#if defined(__SOL8__) || !defined(__i386)
-
#include "xisb.h"
#include "mipointer.h"
#include <sys/stropts.h>
@@ -682,13 +679,6 @@ FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
return pdev;
}
-#else /* __SOL8__ || !__i386 */
-
-#undef MSE_MISC
-#define MSE_MISC 0
-
-#endif /* !__SOL8__ && __i386 */
-
static int
SupportedInterfaces(void)
{
@@ -705,14 +695,13 @@ xf86OSMouseInit(int flags)
if (!p)
return NULL;
p->SupportedInterfaces = SupportedInterfaces;
-#if defined(__SOL8__) || !defined(__i386)
p->BuiltinNames = BuiltinNames;
p->CheckProtocol = CheckProtocol;
p->PreInit = sunMousePreInit;
p->DefaultProtocol = DefaultProtocol;
p->SetupAuto = SetupAuto;
p->FindDevice = FindDevice;
-#endif
+
return p;
}