Skip to content

N
nx-libs
Commit 3b881908 authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

xserver: use own copy of XKBstr.h header

just like upstream does
parent 3739a9b3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
View file @ 3b881908
...@@ -75,7 +75,6 @@ is" without express or implied warranty. ...@@ -75,7 +75,6 @@ is" without express or implied warranty.
#define XKBSRV_NEED_FILE_FUNCS #define XKBSRV_NEED_FILE_FUNCS
#include <nx-X11/extensions/XKBsrv.h> #include <nx-X11/extensions/XKBsrv.h>
#include <nx-X11/extensions/XKBstr.h>
#include <nx-X11/extensions/XKBconfig.h> #include <nx-X11/extensions/XKBconfig.h>
#include <nx-X11/extensions/XKBrules.h> #include <nx-X11/extensions/XKBrules.h>
......
nx-X11/programs/Xserver/include/xkbsrv.h
View file @ 3b881908
...@@ -64,8 +64,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -64,8 +64,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbUpdateActionVirtualMods SrvXkbUpdateActionVirtualMods #define XkbUpdateActionVirtualMods SrvXkbUpdateActionVirtualMods
#define XkbUpdateKeyTypeVirtualMods SrvXkbUpdateKeyTypeVirtualMods #define XkbUpdateKeyTypeVirtualMods SrvXkbUpdateKeyTypeVirtualMods
#include <nx-X11/extensions/XKBstr.h>
#include <nx-X11/extensions/XKBproto.h> #include <nx-X11/extensions/XKBproto.h>
#include "xkbstr.h"
#include "inputstr.h" #include "inputstr.h"
#ifdef NXAGENT_SERVER #ifdef NXAGENT_SERVER
......
nx-X11/programs/Xserver/xkb/maprules.c
View file @ 3b881908
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#include <nx-X11/extensions/XKBstr.h> #include "xkbstr.h"
#define XKBSRV_NEED_FILE_FUNCS #define XKBSRV_NEED_FILE_FUNCS
#include <xkbsrv.h> #include <xkbsrv.h>
......
nx-X11/programs/Xserver/xkb/xkbSwap.c
View file @ 3b881908
...@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include <xkbsrv.h> #include <xkbsrv.h>
#include <nx-X11/extensions/XKBstr.h> #include "xkbstr.h"
#include "extnsionst.h" #include "extnsionst.h"
#include "xkb.h" #include "xkb.h"
......
nx-X11/programs/Xserver/xkb/xkbfmisc.c
View file @ 3b881908
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#include <nx-X11/extensions/XKBstr.h> #include "xkbstr.h"
#define XKBSRV_NEED_FILE_FUNCS 1 #define XKBSRV_NEED_FILE_FUNCS 1
#include <xkbsrv.h> #include <xkbsrv.h>
#include <nx-X11/extensions/XKBgeom.h> #include <nx-X11/extensions/XKBgeom.h>
......
nx-X11/programs/Xserver/xkb/xkbout.c
View file @ 3b881908
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#include <nx-X11/extensions/XKBstr.h> #include "xkbstr.h"
#define XKBSRV_NEED_FILE_FUNCS 1 #define XKBSRV_NEED_FILE_FUNCS 1
#include <xkbsrv.h> #include <xkbsrv.h>
......
nx-X11/programs/Xserver/xkb/xkbtext.c
View file @ 3b881908
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#include <nx-X11/extensions/XKBstr.h> #include "xkbstr.h"
#define XKBSRV_NEED_FILE_FUNCS 1 #define XKBSRV_NEED_FILE_FUNCS 1
#include <xkbsrv.h> #include <xkbsrv.h>
#include <nx-X11/extensions/XKBgeom.h> #include <nx-X11/extensions/XKBgeom.h>
......
nx-X11/programs/Xserver/xkb/xkmread.c
View file @ 3b881908
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#include <nx-X11/keysym.h> #include <nx-X11/keysym.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include <nx-X11/extensions/XKBstr.h> #include "xkbstr.h"
#define XKBSRV_NEED_FILE_FUNCS #define XKBSRV_NEED_FILE_FUNCS
#include <xkbsrv.h> #include <xkbsrv.h>
#include <nx-X11/extensions/XKBgeom.h> #include <nx-X11/extensions/XKBgeom.h>
......
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