diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-07 12:33:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-07 12:33:44 -0700 |
| commit | 8f5aa38abf1158a789b5528df9d98826342e30cf (patch) | |
| tree | 60bcd65c9e0acecce0e9997906aae94d8c3e44c9 | |
| parent | 101ae616962c355388722e05ab8413eb5f5c3402 (diff) | |
fix compiler warning about XKB_IN_SERVER redefinition
| -rw-r--r-- | dix/devices.c | 2 | ||||
| -rw-r--r-- | dix/dispatch.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c index ef1bdf354..c7d3494e8 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -66,7 +66,9 @@ SOFTWARE. #include "cursorstr.h" #include "dixstruct.h" #include "site.h" +#ifndef XKB_IN_SERVER #define XKB_IN_SERVER +#endif #ifdef XKB #include <X11/extensions/XKBsrv.h> #endif diff --git a/dix/dispatch.c b/dix/dispatch.c index c8ee8d610..04e2ba11f 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -115,7 +115,9 @@ int ProcInitialConnection(); #include <X11/extensions/Xagsrv.h> #endif #ifdef XKB +#ifndef XKB_IN_SERVER #define XKB_IN_SERVER +#endif #include "inputstr.h" #include <X11/extensions/XKBsrv.h> #endif |