aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-02-26 05:03:53 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-26 05:09:50 +0100
commit1b54f6462bd8c0ec5eda2007794bbd76f73f6df2 (patch)
tree6720ab763da627b5b36f4759896cf1d17ff7ec64 /nx-X11
parent485d626769c53c7d72ffad2f4e8623d6ce897662 (diff)
downloadnx-libs-1b54f6462bd8c0ec5eda2007794bbd76f73f6df2.tar.gz
nx-libs-1b54f6462bd8c0ec5eda2007794bbd76f73f6df2.tar.bz2
nx-libs-1b54f6462bd8c0ec5eda2007794bbd76f73f6df2.zip
Lift dix to xorg-xserver-1.3.0.0 state - non-functional changes only
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/dix/globals.c4
-rw-r--r--nx-X11/programs/Xserver/dix/swaprep.c6
-rw-r--r--nx-X11/programs/Xserver/dix/swapreq.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXproperty.c3
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 4d33a6c96..8bfd84606 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 74dae817d..315e05016 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 7ea841e12..c88a48b14 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 4482c29a6..6292b3508 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,