fix compiler warning about XKB_IN_SERVER redefinition
This commit is contained in:
parent
101ae61696
commit
8f5aa38abf
|
@ -66,7 +66,9 @@ SOFTWARE.
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "site.h"
|
#include "site.h"
|
||||||
|
#ifndef XKB_IN_SERVER
|
||||||
#define XKB_IN_SERVER
|
#define XKB_IN_SERVER
|
||||||
|
#endif
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
#include <X11/extensions/XKBsrv.h>
|
#include <X11/extensions/XKBsrv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -115,7 +115,9 @@ int ProcInitialConnection();
|
||||||
#include <X11/extensions/Xagsrv.h>
|
#include <X11/extensions/Xagsrv.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
|
#ifndef XKB_IN_SERVER
|
||||||
#define XKB_IN_SERVER
|
#define XKB_IN_SERVER
|
||||||
|
#endif
|
||||||
#include "inputstr.h"
|
#include "inputstr.h"
|
||||||
#include <X11/extensions/XKBsrv.h>
|
#include <X11/extensions/XKBsrv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user