diff options
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r-- | nx-X11/programs/Xserver/xkb/XKBAlloc.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xkb/XKBGAlloc.c | 1 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xkb/XKBMAlloc.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xkb/XKBMisc.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxPrivate.c | 1 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xkb/maprules.c | 3 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbInit.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbfmisc.c | 1 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xkb/xkmread.c | 2 |
9 files changed, 1 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/xkb/XKBAlloc.c b/nx-X11/programs/Xserver/xkb/XKBAlloc.c index a8e72ca1a..4fe4960a3 100644 --- a/nx-X11/programs/Xserver/xkb/XKBAlloc.c +++ b/nx-X11/programs/Xserver/xkb/XKBAlloc.c @@ -28,7 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif - #include <stdio.h> #include <nx-X11/X.h> #include <nx-X11/Xproto.h> @@ -37,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <xkbsrv.h> #include "xkbgeom.h" - /***===================================================================***/ /*ARGSUSED*/ diff --git a/nx-X11/programs/Xserver/xkb/XKBGAlloc.c b/nx-X11/programs/Xserver/xkb/XKBGAlloc.c index bb46bbdcc..b5a7cc317 100644 --- a/nx-X11/programs/Xserver/xkb/XKBGAlloc.c +++ b/nx-X11/programs/Xserver/xkb/XKBGAlloc.c @@ -37,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <xkbsrv.h> #include "xkbgeom.h" - #ifdef X_NOT_POSIX #define Size_t unsigned int #else diff --git a/nx-X11/programs/Xserver/xkb/XKBMAlloc.c b/nx-X11/programs/Xserver/xkb/XKBMAlloc.c index 04af16634..dbd9b25a0 100644 --- a/nx-X11/programs/Xserver/xkb/XKBMAlloc.c +++ b/nx-X11/programs/Xserver/xkb/XKBMAlloc.c @@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif - #include <stdio.h> #include <nx-X11/X.h> #include <nx-X11/Xproto.h> @@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/keysym.h> #include <xkbsrv.h> - /***====================================================================***/ Status diff --git a/nx-X11/programs/Xserver/xkb/XKBMisc.c b/nx-X11/programs/Xserver/xkb/XKBMisc.c index 68edfde74..8e184256e 100644 --- a/nx-X11/programs/Xserver/xkb/XKBMisc.c +++ b/nx-X11/programs/Xserver/xkb/XKBMisc.c @@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <config.h> #endif - #include <stdio.h> #include <nx-X11/X.h> #include <nx-X11/Xproto.h> @@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/keysym.h> #include <xkbsrv.h> - /***====================================================================***/ #define mapSize(m) (sizeof(m)/sizeof(XkbKTMapEntryRec)) diff --git a/nx-X11/programs/Xserver/xkb/ddxPrivate.c b/nx-X11/programs/Xserver/xkb/ddxPrivate.c index 92dc6a03d..0064cabde 100644 --- a/nx-X11/programs/Xserver/xkb/ddxPrivate.c +++ b/nx-X11/programs/Xserver/xkb/ddxPrivate.c @@ -17,4 +17,3 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) { return 0; } - diff --git a/nx-X11/programs/Xserver/xkb/maprules.c b/nx-X11/programs/Xserver/xkb/maprules.c index ccafceeae..c64e1f796 100644 --- a/nx-X11/programs/Xserver/xkb/maprules.c +++ b/nx-X11/programs/Xserver/xkb/maprules.c @@ -36,7 +36,6 @@ #define XOS_USE_NO_LOCKING #include <nx-X11/Xos_r.h> - #include <nx-X11/Xproto.h> #include <nx-X11/X.h> #include <nx-X11/Xos.h> @@ -49,7 +48,6 @@ #include "xkbstr.h" #include <xkbsrv.h> - #ifdef DEBUG #define PR_DEBUG(s) fprintf(stderr,s) #define PR_DEBUG1(s,a) fprintf(stderr,s,a) @@ -1328,4 +1326,3 @@ XkbRF_GroupPtr group; _XkbFree(rules); return; } - diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index 443265d83..a6417afc4 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -134,7 +134,7 @@ char * XkbOptionsUsed= NULL; int _XkbClientMajor= XkbMajorVersion; int _XkbClientMinor= XkbMinorVersion; -Bool noXkbExtension= XKB_DFLT_DISABLED; +Bool noXkbExtension= XKB_DFLT_DISABLED; Bool XkbWantRulesProp= XKB_DFLT_RULES_PROP; /***====================================================================***/ diff --git a/nx-X11/programs/Xserver/xkb/xkbfmisc.c b/nx-X11/programs/Xserver/xkb/xkbfmisc.c index b45e4d903..d2d4a5d43 100644 --- a/nx-X11/programs/Xserver/xkb/xkbfmisc.c +++ b/nx-X11/programs/Xserver/xkb/xkbfmisc.c @@ -35,7 +35,6 @@ #include <nx-X11/Xos.h> #include <nx-X11/Xfuncs.h> - #include <nx-X11/X.h> #include <nx-X11/keysym.h> #include <nx-X11/Xproto.h> diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c index 9364ae710..dca095518 100644 --- a/nx-X11/programs/Xserver/xkb/xkmread.c +++ b/nx-X11/programs/Xserver/xkb/xkmread.c @@ -33,7 +33,6 @@ #include <nx-X11/Xos.h> #include <nx-X11/Xfuncs.h> - #include <nx-X11/X.h> #include <nx-X11/Xproto.h> #include <nx-X11/keysym.h> @@ -51,7 +50,6 @@ XkbInternAtom(Display *dpy,char *str,Bool only_if_exists) return MakeAtom(str,strlen(str),!only_if_exists); } - #ifndef SEEK_SET #define SEEK_SET 0 #endif |