Lift dix to xorg-xserver-1.3.0.0 state - non-functional changes only

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;

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;

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)
 {

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,