Skip to content

N
nx-libs
Unverified Commit 23ad270b authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'uli42-misc_fixes' into 3.6.x

Attributes GH PR #260: https://github.com/ArcticaProject/nx-libs/pull/260
parents a375d178 16947012
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 19 deletions
etc/nxagent.keyboard
View file @ 23ad270b
rules=xfree86 rules="xfree86"
nx-X11/Imakefile
View file @ 23ad270b
...@@ -27,17 +27,7 @@ RELEASE = XOrgReleaseString ...@@ -27,17 +27,7 @@ RELEASE = XOrgReleaseString
#define OSName Unknown Operating System! #define OSName Unknown Operating System!
#endif #endif
#if !BuildServersOnly SUBDIRS = include config lib programs
#ifndef Win32Architecture
#if BuildDocs
DOCSDIR = doc
#endif
NLSSUBDIR = nls
#endif
#endif
SUBDIRS = include config lib $(NLSSUBDIR) \
programs $(FONTSDIR) $(DOCSDIR)
LNINSTALLDIRS = lib LNINSTALLDIRS = lib
#if HasParallelMake #if HasParallelMake
......
nx-X11/programs/Xserver/Xext/saver.c
View file @ 23ad270b
...@@ -686,7 +686,6 @@ ProcScreenSaverQueryVersion (client) ...@@ -686,7 +686,6 @@ ProcScreenSaverQueryVersion (client)
register ClientPtr client; register ClientPtr client;
{ {
xScreenSaverQueryVersionReply rep; xScreenSaverQueryVersionReply rep;
register int n;
REQUEST_SIZE_MATCH (xScreenSaverQueryVersionReq); REQUEST_SIZE_MATCH (xScreenSaverQueryVersionReq);
rep.type = X_Reply; rep.type = X_Reply;
...@@ -708,7 +707,6 @@ ProcScreenSaverQueryInfo (client) ...@@ -708,7 +707,6 @@ ProcScreenSaverQueryInfo (client)
{ {
REQUEST(xScreenSaverQueryInfoReq); REQUEST(xScreenSaverQueryInfoReq);
xScreenSaverQueryInfoReply rep; xScreenSaverQueryInfoReply rep;
register int n;
ScreenSaverStuffPtr pSaver; ScreenSaverStuffPtr pSaver;
DrawablePtr pDraw; DrawablePtr pDraw;
CARD32 lastInput; CARD32 lastInput;
...@@ -1320,7 +1318,6 @@ SProcScreenSaverQueryVersion (client) ...@@ -1320,7 +1318,6 @@ SProcScreenSaverQueryVersion (client)
ClientPtr client; ClientPtr client;
{ {
REQUEST(xScreenSaverQueryVersionReq); REQUEST(xScreenSaverQueryVersionReq);
int n;
swaps (&stuff->length); swaps (&stuff->length);
REQUEST_SIZE_MATCH(xScreenSaverQueryVersionReq); REQUEST_SIZE_MATCH(xScreenSaverQueryVersionReq);
...@@ -1332,7 +1329,6 @@ SProcScreenSaverQueryInfo (client) ...@@ -1332,7 +1329,6 @@ SProcScreenSaverQueryInfo (client)
ClientPtr client; ClientPtr client;
{ {
REQUEST(xScreenSaverQueryInfoReq); REQUEST(xScreenSaverQueryInfoReq);
int n;
swaps (&stuff->length); swaps (&stuff->length);
REQUEST_SIZE_MATCH(xScreenSaverQueryInfoReq); REQUEST_SIZE_MATCH(xScreenSaverQueryInfoReq);
...@@ -1345,7 +1341,6 @@ SProcScreenSaverSelectInput (client) ...@@ -1345,7 +1341,6 @@ SProcScreenSaverSelectInput (client)
ClientPtr client; ClientPtr client;
{ {
REQUEST(xScreenSaverSelectInputReq); REQUEST(xScreenSaverSelectInputReq);
int n;
swaps (&stuff->length); swaps (&stuff->length);
REQUEST_SIZE_MATCH(xScreenSaverSelectInputReq); REQUEST_SIZE_MATCH(xScreenSaverSelectInputReq);
...@@ -1359,7 +1354,6 @@ SProcScreenSaverSetAttributes (client) ...@@ -1359,7 +1354,6 @@ SProcScreenSaverSetAttributes (client)
ClientPtr client; ClientPtr client;
{ {
REQUEST(xScreenSaverSetAttributesReq); REQUEST(xScreenSaverSetAttributesReq);
int n;
swaps (&stuff->length); swaps (&stuff->length);
REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq); REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq);
...@@ -1380,7 +1374,6 @@ SProcScreenSaverUnsetAttributes (client) ...@@ -1380,7 +1374,6 @@ SProcScreenSaverUnsetAttributes (client)
ClientPtr client; ClientPtr client;
{ {
REQUEST(xScreenSaverUnsetAttributesReq); REQUEST(xScreenSaverUnsetAttributesReq);
int n;
swaps (&stuff->length); swaps (&stuff->length);
REQUEST_SIZE_MATCH(xScreenSaverUnsetAttributesReq); REQUEST_SIZE_MATCH(xScreenSaverUnsetAttributesReq);
......
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