This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 1b54f6462bd8c0ec5eda2007794bbd76f73f6df2 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Feb 26 05:03:53 2018 +0100 Lift dix to xorg-xserver-1.3.0.0 state - non-functional changes only --- nx-X11/programs/Xserver/dix/globals.c | 4 ++-- nx-X11/programs/Xserver/dix/swaprep.c | 6 ++---- nx-X11/programs/Xserver/dix/swapreq.c | 2 -- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 3 +-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index 4d33a6c..8bfd846 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -110,8 +110,8 @@ CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME; CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME; CARD16 DPMSPowerLevel = 0; Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED; -Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command line */ -Bool DPMSDisabledSwitch = FALSE; /* switch states */ +Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */ +Bool DPMSDisabledSwitch = FALSE; /* line switch states */ Bool DPMSCapableFlag = FALSE; CARD32 DPMSStandbyTime; CARD32 DPMSSuspendTime; diff --git a/nx-X11/programs/Xserver/dix/swaprep.c b/nx-X11/programs/Xserver/dix/swaprep.c index 74dae81..315e050 100644 --- a/nx-X11/programs/Xserver/dix/swaprep.c +++ b/nx-X11/programs/Xserver/dix/swaprep.c @@ -354,8 +354,7 @@ SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply *pRep) WriteToClient(pClient, size, pRep); } -static -void +static void SwapCharInfo(xCharInfo *pInfo) { swaps(&pInfo->leftSideBearing); @@ -380,8 +379,7 @@ SwapFontInfo(xQueryFontReply *pr) swapl(&pr->nCharInfos); } -static -void +static void SwapFont(xQueryFontReply *pr, Bool hasGlyphs) { unsigned i; diff --git a/nx-X11/programs/Xserver/dix/swapreq.c b/nx-X11/programs/Xserver/dix/swapreq.c index 7ea841e..c88a48b 100644 --- a/nx-X11/programs/Xserver/dix/swapreq.c +++ b/nx-X11/programs/Xserver/dix/swapreq.c @@ -61,7 +61,6 @@ SOFTWARE. /* Thanks to Jack Palevich for testing and subsequently rewriting all this */ /* Byte swap a list of longs */ - void SwapLongs (register CARD32 *list, register unsigned long count) { @@ -86,7 +85,6 @@ SwapLongs (register CARD32 *list, register unsigned long count) } /* Byte swap a list of shorts */ - void SwapShorts (register short *list, register unsigned long count) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 4482c29..6292b35 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -275,7 +275,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, { if (totalSize != pProp->size * (pProp->format >> 3)) { - data = (void *)realloc(pProp->data, totalSize); + data = (void *)realloc(pProp->data, totalSize); if (!data && len) return(BadAlloc); pProp->data = data; @@ -349,7 +349,6 @@ ProcGetProperty(ClientPtr client) REQUEST(xGetPropertyReq); REQUEST_SIZE_MATCH(xGetPropertyReq); - if (stuff->delete) UpdateCurrentTime(); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git