diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-30 14:25:57 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-30 14:25:57 +0100 |
| commit | 23ad270b5bfff3d5bf208dbb63a4656c4a5cf9f7 (patch) | |
| tree | 826f0582525f20bfc7c331253c0f8e3e6d493624 | |
| parent | a375d178f6abdfa51e28cb76af67ec5d77490afb (diff) | |
| parent | 16947012def69e4abfbe91c57bc9e42ffee02937 (diff) | |
| download | nx-libs-23ad270b5bfff3d5bf208dbb63a4656c4a5cf9f7.tar.gz nx-libs-23ad270b5bfff3d5bf208dbb63a4656c4a5cf9f7.tar.bz2 nx-libs-23ad270b5bfff3d5bf208dbb63a4656c4a5cf9f7.zip | |
Merge branch 'uli42-misc_fixes' into 3.6.x
Attributes GH PR #260: https://github.com/ArcticaProject/nx-libs/pull/260
| -rw-r--r-- | etc/nxagent.keyboard | 2 | ||||
| -rw-r--r-- | nx-X11/Imakefile | 12 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/saver.c | 7 |
3 files changed, 2 insertions, 19 deletions
diff --git a/etc/nxagent.keyboard b/etc/nxagent.keyboard index afe283260..dd6d17eed 100644 --- a/etc/nxagent.keyboard +++ b/etc/nxagent.keyboard @@ -1 +1 @@ -rules=xfree86 +rules="xfree86" diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile index f2a8ca8ad..9c8eb5a04 100644 --- a/nx-X11/Imakefile +++ b/nx-X11/Imakefile @@ -27,17 +27,7 @@ RELEASE = XOrgReleaseString #define OSName Unknown Operating System! #endif -#if !BuildServersOnly -#ifndef Win32Architecture -#if BuildDocs - DOCSDIR = doc -#endif - NLSSUBDIR = nls -#endif -#endif - - SUBDIRS = include config lib $(NLSSUBDIR) \ - programs $(FONTSDIR) $(DOCSDIR) + SUBDIRS = include config lib programs LNINSTALLDIRS = lib #if HasParallelMake diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index da94847a5..51f18e4e4 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -686,7 +686,6 @@ ProcScreenSaverQueryVersion (client) register ClientPtr client; { xScreenSaverQueryVersionReply rep; - register int n; REQUEST_SIZE_MATCH (xScreenSaverQueryVersionReq); rep.type = X_Reply; @@ -708,7 +707,6 @@ ProcScreenSaverQueryInfo (client) { REQUEST(xScreenSaverQueryInfoReq); xScreenSaverQueryInfoReply rep; - register int n; ScreenSaverStuffPtr pSaver; DrawablePtr pDraw; CARD32 lastInput; @@ -1320,7 +1318,6 @@ SProcScreenSaverQueryVersion (client) ClientPtr client; { REQUEST(xScreenSaverQueryVersionReq); - int n; swaps (&stuff->length); REQUEST_SIZE_MATCH(xScreenSaverQueryVersionReq); @@ -1332,7 +1329,6 @@ SProcScreenSaverQueryInfo (client) ClientPtr client; { REQUEST(xScreenSaverQueryInfoReq); - int n; swaps (&stuff->length); REQUEST_SIZE_MATCH(xScreenSaverQueryInfoReq); @@ -1345,7 +1341,6 @@ SProcScreenSaverSelectInput (client) ClientPtr client; { REQUEST(xScreenSaverSelectInputReq); - int n; swaps (&stuff->length); REQUEST_SIZE_MATCH(xScreenSaverSelectInputReq); @@ -1359,7 +1354,6 @@ SProcScreenSaverSetAttributes (client) ClientPtr client; { REQUEST(xScreenSaverSetAttributesReq); - int n; swaps (&stuff->length); REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq); @@ -1380,7 +1374,6 @@ SProcScreenSaverUnsetAttributes (client) ClientPtr client; { REQUEST(xScreenSaverUnsetAttributesReq); - int n; swaps (&stuff->length); REQUEST_SIZE_MATCH(xScreenSaverUnsetAttributesReq); |