Commit 736a2333 authored by Ulrich Sibiller's avatar Ulrich Sibiller

xserver: adapt xkbsrc includes syntax to match upstream

parent a2a7482f
...@@ -62,7 +62,7 @@ SOFTWARE. ...@@ -62,7 +62,7 @@ SOFTWARE.
#include "dixstruct.h" #include "dixstruct.h"
#include "site.h" #include "site.h"
#ifdef XKB #ifdef XKB
#include <xkbsrv.h> #include "xkbsrv.h"
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #define _SECURITY_SERVER
......
...@@ -110,7 +110,7 @@ int ProcInitialConnection(); ...@@ -110,7 +110,7 @@ int ProcInitialConnection();
#endif #endif
#ifdef XKB #ifdef XKB
#include "inputstr.h" #include "inputstr.h"
#include <xkbsrv.h> #include "xkbsrv.h"
#endif #endif
#define mskcnt ((MAXCLIENTS + 31) / 32) #define mskcnt ((MAXCLIENTS + 31) / 32)
......
...@@ -129,7 +129,7 @@ of the copyright holder. ...@@ -129,7 +129,7 @@ of the copyright holder.
#include "globals.h" #include "globals.h"
#ifdef XKB #ifdef XKB
#include <xkbsrv.h> #include "xkbsrv.h"
extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
#endif #endif
......
...@@ -144,7 +144,7 @@ OR PERFORMANCE OF THIS SOFTWARE. ...@@ -144,7 +144,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#endif #endif
#ifdef XKB #ifdef XKB
#include <xkbsrv.h> #include "xkbsrv.h"
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #define _SECURITY_SERVER
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "xkbstr.h" #include "xkbstr.h"
#include <xkbsrv.h> #include "xkbsrv.h"
#include "xkbgeom.h" #include "xkbgeom.h"
Atom Atom
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment