diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-03-18 16:31:19 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-03-20 18:37:02 -0400 |
| commit | 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d (patch) | |
| tree | 58063be57aef43d15f51822264d4a7a789ee7c77 /dix | |
| parent | 9398d62f27ee1b287e4458fd8b011c10f7b59efd (diff) | |
Static markup and dead code cull over xkb/.
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header. Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 2 | ||||
| -rw-r--r-- | dix/dispatch.c | 2 | ||||
| -rw-r--r-- | dix/events.c | 2 | ||||
| -rw-r--r-- | dix/getevents.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/dix/devices.c b/dix/devices.c index 8eb54f770..f73841932 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -67,7 +67,7 @@ SOFTWARE. #define XKB_IN_SERVER #endif #ifdef XKB -#include <X11/extensions/XKBsrv.h> +#include <xkbsrv.h> #endif #include "xace.h" diff --git a/dix/dispatch.c b/dix/dispatch.c index b258aa6f4..32f67886e 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -143,7 +143,7 @@ int ProcInitialConnection(); #define XKB_IN_SERVER #endif #include "inputstr.h" -#include <X11/extensions/XKBsrv.h> +#include <xkbsrv.h> #endif #ifdef XSERVER_DTRACE diff --git a/dix/events.c b/dix/events.c index c0b62b826..02598a394 100644 --- a/dix/events.c +++ b/dix/events.c @@ -133,7 +133,7 @@ of the copyright holder. #ifdef XKB #include <X11/extensions/XKBproto.h> -#include <X11/extensions/XKBsrv.h> +#include <xkbsrv.h> extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif diff --git a/dix/getevents.c b/dix/getevents.c index 935112d85..3f636bc80 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -44,7 +44,7 @@ #ifdef XKB #include <X11/extensions/XKBproto.h> -#include <X11/extensions/XKBsrv.h> +#include <xkbsrv.h> extern Bool XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies); #endif |