Skip to content

N
nx-libs
Commit 00e3e95e authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mihai Moldovan
Browse files
Options

Lift xkb to xorg-xserver-7.1/1.1.0 state - non-functional changes only

parent 9e6f87e2
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 15 deletions
nx-X11/programs/Xserver/xkb/XKBAlloc.c
View file @ 00e3e95e
...@@ -28,7 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -28,7 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <nx-X11/X.h> #include <nx-X11/X.h>
#include <nx-X11/Xproto.h> #include <nx-X11/Xproto.h>
...@@ -37,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -37,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h> #include <xkbsrv.h>
#include "xkbgeom.h" #include "xkbgeom.h"
/***===================================================================***/ /***===================================================================***/
/*ARGSUSED*/ /*ARGSUSED*/
......
nx-X11/programs/Xserver/xkb/XKBGAlloc.c
View file @ 00e3e95e
...@@ -37,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -37,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h> #include <xkbsrv.h>
#include "xkbgeom.h" #include "xkbgeom.h"
#ifdef X_NOT_POSIX #ifdef X_NOT_POSIX
#define Size_t unsigned int #define Size_t unsigned int
#else #else
......
nx-X11/programs/Xserver/xkb/XKBMAlloc.c
View file @ 00e3e95e
...@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <nx-X11/X.h> #include <nx-X11/X.h>
#include <nx-X11/Xproto.h> #include <nx-X11/Xproto.h>
...@@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <nx-X11/keysym.h> #include <nx-X11/keysym.h>
#include <xkbsrv.h> #include <xkbsrv.h>
/***====================================================================***/ /***====================================================================***/
Status Status
......
nx-X11/programs/Xserver/xkb/XKBMisc.c
View file @ 00e3e95e
...@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <nx-X11/X.h> #include <nx-X11/X.h>
#include <nx-X11/Xproto.h> #include <nx-X11/Xproto.h>
...@@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <nx-X11/keysym.h> #include <nx-X11/keysym.h>
#include <xkbsrv.h> #include <xkbsrv.h>
/***====================================================================***/ /***====================================================================***/
#define mapSize(m) (sizeof(m)/sizeof(XkbKTMapEntryRec)) #define mapSize(m) (sizeof(m)/sizeof(XkbKTMapEntryRec))
......
nx-X11/programs/Xserver/xkb/ddxPrivate.c
View file @ 00e3e95e
...@@ -17,4 +17,3 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) ...@@ -17,4 +17,3 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act)
{ {
return 0; return 0;
} }
nx-X11/programs/Xserver/xkb/maprules.c
View file @ 00e3e95e
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#define XOS_USE_NO_LOCKING #define XOS_USE_NO_LOCKING
#include <nx-X11/Xos_r.h> #include <nx-X11/Xos_r.h>
#include <nx-X11/Xproto.h> #include <nx-X11/Xproto.h>
#include <nx-X11/X.h> #include <nx-X11/X.h>
#include <nx-X11/Xos.h> #include <nx-X11/Xos.h>
...@@ -49,7 +48,6 @@ ...@@ -49,7 +48,6 @@
#include "xkbstr.h" #include "xkbstr.h"
#include <xkbsrv.h> #include <xkbsrv.h>
#ifdef DEBUG #ifdef DEBUG
#define PR_DEBUG(s) fprintf(stderr,s) #define PR_DEBUG(s) fprintf(stderr,s)
#define PR_DEBUG1(s,a) fprintf(stderr,s,a) #define PR_DEBUG1(s,a) fprintf(stderr,s,a)
...@@ -1328,4 +1326,3 @@ XkbRF_GroupPtr group; ...@@ -1328,4 +1326,3 @@ XkbRF_GroupPtr group;
_XkbFree(rules); _XkbFree(rules);
return; return;
} }
nx-X11/programs/Xserver/xkb/xkbInit.c
View file @ 00e3e95e
...@@ -134,7 +134,7 @@ char * XkbOptionsUsed= NULL; ...@@ -134,7 +134,7 @@ char * XkbOptionsUsed= NULL;
int _XkbClientMajor= XkbMajorVersion; int _XkbClientMajor= XkbMajorVersion;
int _XkbClientMinor= XkbMinorVersion; int _XkbClientMinor= XkbMinorVersion;
Bool noXkbExtension= XKB_DFLT_DISABLED; Bool noXkbExtension= XKB_DFLT_DISABLED;
Bool XkbWantRulesProp= XKB_DFLT_RULES_PROP; Bool XkbWantRulesProp= XKB_DFLT_RULES_PROP;
/***====================================================================***/ /***====================================================================***/
......
nx-X11/programs/Xserver/xkb/xkbfmisc.c
View file @ 00e3e95e
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <nx-X11/Xos.h> #include <nx-X11/Xos.h>
#include <nx-X11/Xfuncs.h> #include <nx-X11/Xfuncs.h>
#include <nx-X11/X.h> #include <nx-X11/X.h>
#include <nx-X11/keysym.h> #include <nx-X11/keysym.h>
#include <nx-X11/Xproto.h> #include <nx-X11/Xproto.h>
......
nx-X11/programs/Xserver/xkb/xkmread.c
View file @ 00e3e95e
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <nx-X11/Xos.h> #include <nx-X11/Xos.h>
#include <nx-X11/Xfuncs.h> #include <nx-X11/Xfuncs.h>
#include <nx-X11/X.h> #include <nx-X11/X.h>
#include <nx-X11/Xproto.h> #include <nx-X11/Xproto.h>
#include <nx-X11/keysym.h> #include <nx-X11/keysym.h>
...@@ -51,7 +50,6 @@ XkbInternAtom(Display *dpy,char *str,Bool only_if_exists) ...@@ -51,7 +50,6 @@ XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)
return MakeAtom(str,strlen(str),!only_if_exists); return MakeAtom(str,strlen(str),!only_if_exists);
} }
#ifndef SEEK_SET #ifndef SEEK_SET
#define SEEK_SET 0 #define SEEK_SET 0
#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