aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-12-03 23:06:32 +0100
committerUlrich Sibiller <uli42@gmx.de>2016-12-03 23:06:32 +0100
commitc5e06d4087c8639b4e186502d7c6ff545638cbba (patch)
treecbe69d210512514b9d9b3aee4d13b5ea7f5111e8 /nx-X11/programs/Xserver
parenta0a429cc7da5eb8083a9120986d0740412e37207 (diff)
downloadnx-libs-c5e06d4087c8639b4e186502d7c6ff545638cbba.tar.gz
nx-libs-c5e06d4087c8639b4e186502d7c6ff545638cbba.tar.bz2
nx-libs-c5e06d4087c8639b4e186502d7c6ff545638cbba.zip
Fix compilation warnings
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c14
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c6
2 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index e6451292f..1aa60c40d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3951,7 +3951,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
prevmode = pScrPriv->crtcs[i]->mode;
#ifdef DEBUG
if (prevmode) {
- fprintf(stderr, "nxagentAdjustRandRXinerama: output %d: prevmode [%s] ([%p]) refcnt [%d]\n", i, prevmode->name, prevmode, prevmode->refcnt);
+ fprintf(stderr, "nxagentAdjustRandRXinerama: output %d: prevmode [%s] ([%p]) refcnt [%d]\n", i, prevmode->name, (void *)prevmode, prevmode->refcnt);
} else {
fprintf(stderr, "nxagentAdjustRandRXinerama: output %d: no prevmode\n", i);
}
@@ -4017,7 +4017,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
#ifdef DEBUG
if (mymode) {
- fprintf(stderr, "nxagentAdjustRandRXinerama: output %d: mode [%s] ([%p]) created/received, refcnt [%d]\n", i, name, mymode, mymode->refcnt);
+ fprintf(stderr, "nxagentAdjustRandRXinerama: output %d: mode [%s] ([%p]) created/received, refcnt [%d]\n", i, name, (void *)mymode, mymode->refcnt);
}
else
{
@@ -4027,7 +4027,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
#endif
if (prevmode && mymode == prevmode) {
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: mymode [%s] ([%p]) == prevmode [%s] ([%p])\n", mymode->name, mymode, prevmode->name, prevmode);
+ fprintf(stderr, "nxagentAdjustRandRXinerama: mymode [%s] ([%p]) == prevmode [%s] ([%p])\n", mymode->name, (void *)mymode, prevmode->name, (void *)prevmode);
#endif
/* if they are the same RRModeGet() has increased the
@@ -4038,12 +4038,12 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
else
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: setting mode [%s] ([%p]) refcnt [%d] for output %d\n", mymode->name, mymode, mymode->refcnt, i);
+ fprintf(stderr, "nxagentAdjustRandRXinerama: setting mode [%s] ([%p]) refcnt [%d] for output %d\n", mymode->name, (void *)mymode, mymode->refcnt, i);
#endif
RROutputSetModes(pScrPriv->outputs[i], &mymode, 1, 0);
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: setting mode [%s] ([%p]) refcnt [%d] for crtc %d\n", mymode->name, mymode, mymode->refcnt, i);
+ fprintf(stderr, "nxagentAdjustRandRXinerama: setting mode [%s] ([%p]) refcnt [%d] for crtc %d\n", mymode->name, (void *)mymode, mymode->refcnt, i);
#endif
RRCrtcSet(pScrPriv->crtcs[i], mymode, new_x, new_y, RR_Rotate_0, 1, &(pScrPriv->outputs[i]));
@@ -4075,7 +4075,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
for (i = 0; i < pScrPriv->numCrtcs; i++) {
RRModePtr mode = pScrPriv->crtcs[i]->mode;
if (mode) {
- fprintf(stderr, "nxagentAdjustRandRXinerama: crtc %d has mode [%s] ([%p]), refcnt [%d] and %d outputs\n", i, pScrPriv->crtcs[i]->mode->name, pScrPriv->crtcs[i]->mode, pScrPriv->crtcs[i]->mode->refcnt, pScrPriv->crtcs[i]->numOutputs);
+ fprintf(stderr, "nxagentAdjustRandRXinerama: crtc %d has mode [%s] ([%p]), refcnt [%d] and %d outputs\n", i, pScrPriv->crtcs[i]->mode->name, (void *)pScrPriv->crtcs[i]->mode, pScrPriv->crtcs[i]->mode->refcnt, pScrPriv->crtcs[i]->numOutputs);
}
else
{
@@ -4083,7 +4083,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
}
if (pScrPriv->crtcs[i]->numOutputs > 0)
- fprintf(stderr, " output[%d]->crtc=[%p]\n", i, pScrPriv->outputs[i]->crtc);
+ fprintf(stderr, " output[%d]->crtc=[%p]\n", i, (void *)pScrPriv->outputs[i]->crtc);
}
#endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
index a91b0c568..8a53da376 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
@@ -821,7 +821,7 @@ Status NXGetControlParameters(Display *dpy, unsigned int *link_type, unsigned in
{
xNXGetControlParametersReply rep;
- register xReq *req;
+ _X_UNUSED register xReq *req;
LockDisplay(dpy);
@@ -1169,7 +1169,7 @@ Status NXGetShmemParameters(Display *dpy, unsigned int *enable_client,
Status NXGetFontParameters(Display *dpy, unsigned int path_length, char path_data[])
{
- register xNXGetFontParametersReq *req;
+ _X_UNUSED register xNXGetFontParametersReq *req;
xNXGetFontParametersReply rep;
@@ -4626,7 +4626,7 @@ int NXGetCollectInputFocusResource(Display *dpy)
int NXCollectInputFocus(Display *dpy, unsigned int resource)
{
- register xReq *req;
+ _X_UNUSED register xReq *req;
_NXCollectInputFocusState *state;
_XAsyncHandler *handler;