diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-18 18:16:12 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-18 18:17:38 -0400 |
| commit | 84683f19b4d1c712281036bcabf8dc623e64b26a (patch) | |
| tree | 94c61eca298da6f6200fcb8ba8a4d1009b1495b7 /dix | |
| parent | 881953813c7307f2aac4057b48d233e5f4a574cd (diff) | |
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/Makefile.am | 2 | ||||
| -rw-r--r-- | dix/atom.c | 2 | ||||
| -rw-r--r-- | dix/colormap.c | 3 | ||||
| -rw-r--r-- | dix/events.c | 6 |
4 files changed, 6 insertions, 7 deletions
diff --git a/dix/Makefile.am b/dix/Makefile.am index 414f1258c..d26d9ea7a 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libdix.la libxpstubs.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \ +AM_CFLAGS = $(DIX_CFLAGS) \ -DVENDOR_STRING=\""@VENDOR_STRING@"\" \ -DVENDOR_RELEASE="@VENDOR_RELEASE@" diff --git a/dix/atom.c b/dix/atom.c index 53cd5c311..e6577fdd6 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -54,6 +54,8 @@ SOFTWARE. #include <X11/X.h> #include <X11/Xatom.h> +#include <stdio.h> +#include <string.h> #include "misc.h" #include "resource.h" #include "dix.h" diff --git a/dix/colormap.c b/dix/colormap.c index ba52c251c..b8d8586b0 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -56,6 +56,9 @@ SOFTWARE. #include <X11/X.h> #define NEED_EVENTS #include <X11/Xproto.h> +#include <stdio.h> +#include <string.h> +#include <strings.h> #include "misc.h" #include "dix.h" #include "colormapst.h" diff --git a/dix/events.c b/dix/events.c index c67cf8ce4..479b4d80c 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3019,9 +3019,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count butc->buttonsDown++; butc->motionMask = ButtonMotionMask; *kptr |= bit; -#if !defined(XFree86Server) || !defined(XINPUT) - xE->u.u.detail = butc->map[key]; -#endif if (xE->u.u.detail == 0) return; if (xE->u.u.detail <= 5) @@ -3038,9 +3035,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count if (!butc->buttonsDown) butc->motionMask = 0; *kptr &= ~bit; -#if !defined(XFree86Server) || !defined(XINPUT) - xE->u.u.detail = butc->map[key]; -#endif if (xE->u.u.detail == 0) return; if (xE->u.u.detail <= 5) |