Skip to content

N
nx-libs
Commit 2c31ce2f authored by Ulrich Sibiller's avatar Ulrich Sibiller
1 Browse files
Options

xserver: use own copy of XKBrules.h header

just like upstream does
parent e6018439
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
nx-X11/programs/Xserver/include/xkbsrv.h
View file @ 2c31ce2f
...@@ -1098,7 +1098,7 @@ extern void XkbSendNewKeyboardNotify( ...@@ -1098,7 +1098,7 @@ extern void XkbSendNewKeyboardNotify(
#ifdef XKBSRV_NEED_FILE_FUNCS #ifdef XKBSRV_NEED_FILE_FUNCS
#include <nx-X11/extensions/XKMformat.h> #include <nx-X11/extensions/XKMformat.h>
#include <nx-X11/extensions/XKBfile.h> #include "xkbfile.h"
#include "xkbrules.h" #include "xkbrules.h"
#define _XkbListKeymaps 0 #define _XkbListKeymaps 0
......
nx-X11/programs/Xserver/xkb/xkb.h
View file @ 2c31ce2f
/* $XFree86$ */ /* $XFree86$ */
/* #include "XKBfile.h" */
extern int ProcXkbUseExtension(ClientPtr client); extern int ProcXkbUseExtension(ClientPtr client);
extern int ProcXkbSelectEvents(ClientPtr client); extern int ProcXkbSelectEvents(ClientPtr client);
extern int ProcXkbBell(ClientPtr client); extern int ProcXkbBell(ClientPtr client);
......
nx-X11/programs/Xserver/xkb/xkbInit.c
View file @ 2c31ce2f
...@@ -50,7 +50,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -50,7 +50,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h> #include <xkbsrv.h>
#include <nx-X11/extensions/XKBgeom.h> #include <nx-X11/extensions/XKBgeom.h>
#include <nx-X11/extensions/XKMformat.h> #include <nx-X11/extensions/XKMformat.h>
#include <nx-X11/extensions/XKBfile.h> #include "xkbfile.h"
#include "xkb.h" #include "xkb.h"
#define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1) #define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1)
......
nx-X11/programs/Xserver/xkb/xkbout.c
View file @ 2c31ce2f
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include <xkbsrv.h> #include <xkbsrv.h>
#include <nx-X11/extensions/XKBgeom.h> #include <nx-X11/extensions/XKBgeom.h>
#include <nx-X11/extensions/XKBfile.h> #include "xkbfile.h"
#endif #endif
......
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