From e02bdf929248d24445733837121a0a0bf6eeb691 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 12:50:14 +0200 Subject: hw/nxagent/Args.c: Fix fprintf placeholder (%u -> %lu). --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 895de1ef8..0d6e4f87e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -1380,7 +1380,7 @@ static void nxagentParseOptions(char *name, char *value) sleep_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), sleep_parse); } @@ -1389,7 +1389,7 @@ static void nxagentParseOptions(char *name, char *value) sleep_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), sleep_parse); } -- cgit v1.2.3 From 35dbbd7e448f327d0496b76a8170df025b0fcea0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 12:53:21 +0200 Subject: hw/nxagent/Exrensions.c: Post-RandR 1.5 update fix. Properly set rrProvider hook functions to NULL. --- nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c index 494027927..4af925681 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c @@ -142,9 +142,9 @@ void nxagentInitRandRExtension(ScreenPtr pScreen) /* only fake provider support in nx-X11, so far */ pRandRScrPriv -> provider = RRProviderCreate(pScreen, "default", 7); pRandRScrPriv -> rrProviderSetOutputSource = NULL; - pRandRScrPriv -> rrProviderSetOffloadSink; - pRandRScrPriv -> rrProviderGetProperty; - pRandRScrPriv -> rrProviderSetProperty; + pRandRScrPriv -> rrProviderSetOffloadSink = NULL; + pRandRScrPriv -> rrProviderGetProperty = NULL; + pRandRScrPriv -> rrProviderSetProperty = NULL; #endif #if RANDR_13_INTERFACE -- cgit v1.2.3 From b15fc63f4c0c4c741af1255d17907ba3b98b5cf9 Mon Sep 17 00:00:00 2001 From: Tomas Carnecky Date: Tue, 5 Jul 2016 08:16:09 +0200 Subject: Replace INITARGS with void INITARGS was a hardcoded define to void. Since knowing the function signature for your extensions is kinda useful, just replace it with a hardcoded void, but leave the define there for API compatibility. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Cyril Brulebois Reviewed-by: Jamey Sharp Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard Backport to nx-libs: Mike Gabriel --- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 86b9e0d24..28b42d676 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -76,7 +76,7 @@ extern void fbPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, char *pImage); void -ShmExtensionInit(INITARGS) +ShmExtensionInit(void) { ExtensionEntry *extEntry; int i; -- cgit v1.2.3