summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@openbsd.org>2009-11-22 19:26:48 +0000
committerMatthieu Herrb <matthieu@openbsd.org>2009-11-22 19:26:48 +0000
commitb857a3af63203448c6bdb666efdffad6c7974487 (patch)
treedf44ffbb00e07e5a997be18272f6953d09abadea
parentca66d2760ebc02e67e55234cbc56d0dd29395e0f (diff)
unifdef XFree86Loader. It's mandatory nowadays.
-rw-r--r--src/ws.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ws.c b/src/ws.c
index f476946..cb7fd21 100644
--- a/src/ws.c
+++ b/src/ws.c
@@ -34,9 +34,7 @@
#include <mipointer.h>
#include <extinit.h>
-#ifdef XFree86LOADER
#include "xf86Module.h"
-#endif
#define NAXES 2 /* X and Y axes only */
#define NBUTTONS 32 /* max theoretical buttons */
@@ -59,11 +57,9 @@ typedef struct WSDevice {
int negativeW, positiveW; /* mappings for W axis */
} WSDeviceRec, *WSDevicePtr;
-#ifdef XFree86LOADER
static MODULESETUPPROTO(SetupProc);
static void TearDownProc(pointer);
static const OptionInfoRec *wsAvailableOptions(void *);
-#endif
static InputInfoPtr wsPreInit(InputDriverPtr, IDevPtr, int);
static int wsProc(DeviceIntPtr, int);
@@ -144,7 +140,6 @@ static int debug_level = 0;
# define DBG(lvl, f)
#endif
-#ifdef XFree86LOADER
static pointer
SetupProc(pointer module, pointer options, int *errmaj, int *errmin)
{
@@ -168,7 +163,6 @@ wsAvailableOptions(void *unused)
{
return WSOptions;
}
-#endif /* XFree86LOADER */
static InputInfoPtr
wsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)