diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-20 10:31:24 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-20 10:31:24 +0200 |
| commit | 61b8d44f1f76df5abb9e53427f07e9f1ad987e32 (patch) | |
| tree | f0f84ebfb28ec44254def01211eeca94c76aeed4 /nx-X11/programs/Xserver/hw/nxagent | |
| parent | da01dc8da1aedb1f75d62c03748a239c54b14483 (diff) | |
| parent | 50eb5e4a9bf812895a7d5c4e6ae0775c6910931f (diff) | |
| download | nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.gz nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.bz2 nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.zip | |
Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.x
Attributes GH PR #230: https://github.com/ArcticaProject/nx-libs/pull/230
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Colormap.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Display.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 1c93bbbe5..7d256f5c5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -1447,7 +1447,7 @@ static void nxagentParseOptions(char *name, char *value) tolerance_parse = UINT_MAX; fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] " - "out of range, clamped to [%u].\n", + "out of range, clamped to [%lu].\n", validateString(value), validateString(name), tolerance_parse); } @@ -1456,7 +1456,7 @@ static void nxagentParseOptions(char *name, char *value) tolerance_parse = 0; fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] " - "out of range, clamped to [%u].\n", + "out of range, clamped to [%lu].\n", validateString(value), validateString(name), tolerance_parse); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index ecfbe210e..c21bcbbe7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -311,7 +311,7 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) { fprintf(stderr, "nxagentSetInstalledColormapWindows: WARNING! " "Window at [%p] has no colormap with class [%d].\n", - pWin, pWin -> drawable.class); + (void *)pWin, pWin -> drawable.class); } #endif } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 04f2fbb4c..f1fb1e902 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -2468,7 +2468,6 @@ static int nxagentCheckForPixmapFormatsCompatibility() */ bool compatible = true; - bool one_match = false; bool matched = false; int total_matches = 0; @@ -2483,7 +2482,6 @@ static int nxagentCheckForPixmapFormatsCompatibility() nxagentPixmapFormats[i].scanline_pad == nxagentRemotePixmapFormats[j].scanline_pad) { matched = true; - one_match = true; ++total_matches; break; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index e39afe240..f81e08ebc 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -1953,7 +1953,7 @@ Bool nxagentUnrealizeWindow(pWin) void nxagentFrameBufferPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what) { - void *PaintWindowBackgroundBackup; + void (*PaintWindowBackgroundBackup)(WindowPtr, RegionPtr, int); if (pWin->backgroundState == BackgroundPixmap) { |