diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-07 21:38:18 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-07 21:38:18 +0200 |
| commit | 3039a34cbd8716766391fe7de5ea002f643bf143 (patch) | |
| tree | 3dedb91af3a6a473d05b516eb7881065ca397ab7 /nx-X11/programs/Xserver/xkb/xkbDflts.h | |
| parent | 168c063dcaa8b60a3b6e3e1132416841d48419ea (diff) | |
| parent | 736a2333e655ecfee78cb82f074cce5e84bdc218 (diff) | |
| download | nx-libs-3039a34cbd8716766391fe7de5ea002f643bf143.tar.gz nx-libs-3039a34cbd8716766391fe7de5ea002f643bf143.tar.bz2 nx-libs-3039a34cbd8716766391fe7de5ea002f643bf143.zip | |
Merge branch 'uli42-pr/decouple-xserver' into 3.6.x
Attributes GH PR #208: https://github.com/ArcticaProject/nx-libs/pull/208
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbDflts.h')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbDflts.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbDflts.h b/nx-X11/programs/Xserver/xkb/xkbDflts.h index 9c99a4c70..c3c28524b 100644 --- a/nx-X11/programs/Xserver/xkb/xkbDflts.h +++ b/nx-X11/programs/Xserver/xkb/xkbDflts.h @@ -7,13 +7,8 @@ #ifndef DEFAULT_H #define DEFAULT_H 1 -#ifndef XKB_IN_SERVER -#define GET_ATOM(d,s) XInternAtom(d,s,0) -#define DPYTYPE Display * -#else #define GET_ATOM(d,s) MakeAtom(s,strlen(s),1) #define DPYTYPE char * -#endif #define NUM_KEYS 1 #define vmod_NumLock 0 |