Align files with upstream libX11-1.6.0

nx-X11/lib/X11/AllCells.c

@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

nx-X11/lib/X11/DrArc.c

@@ -66,6 +66,7 @@ XDrawArc(
     arc->angle1 = angle1;
     arc->angle2 = angle2;
 
+
     UnlockDisplay(dpy);
     SyncHandle();
     return 1;

nx-X11/lib/X11/FillRcts.c

@@ -63,3 +63,4 @@ XFillRectangles(
     SyncHandle();
     return 1;
 }
+

nx-X11/lib/X11/Font.c

@@ -260,7 +260,6 @@ _XQueryFont (
      * If no characters in font, then it is a bad font, but
      * shouldn't try to read nothing.
      */
-    /* have to unpack charinfos on some machines (CRAY) */
     fs->per_char = NULL;
     if (reply.nCharInfos > 0){
 	/* nCharInfos is a CARD32 */

nx-X11/lib/X11/FreeGC.c

@@ -47,3 +47,4 @@ XFreeGC (
     Xfree ((char *) gc);
     return 1;
     }
+

nx-X11/lib/X11/ImUtil.c

@@ -543,8 +543,7 @@ static unsigned long _XGetPixel32 (
 			[y * ximage->bytes_per_line + (x << 2)];
 	    if (*((const char *)&byteorderpixel) == ximage->byte_order)
 		pixel = *((CARD32 *)addr);
-	    else
-	    if (ximage->byte_order == MSBFirst)
+	    else if (ximage->byte_order == MSBFirst)
 		pixel = ((unsigned long)addr[0] << 24 |
 			 (unsigned long)addr[1] << 16 |
 			 (unsigned long)addr[2] << 8 |
@@ -732,8 +731,7 @@ static int _XPutPixel32 (
 			[y * ximage->bytes_per_line + (x << 2)];
 	    if (*((const char *)&byteorderpixel) == ximage->byte_order)
 		*((CARD32 *)addr) = pixel;
-	    else
-	    if (ximage->byte_order == MSBFirst) {
+	    else if (ximage->byte_order == MSBFirst) {
 		addr[0] = pixel >> 24;
 		addr[1] = pixel >> 16;
 		addr[2] = pixel >> 8;

nx-X11/lib/X11/LiHosts.c

@@ -154,3 +154,4 @@ XHostAddress *XListHosts (
 
 
 
+

nx-X11/lib/X11/PolyTxt16.c

@@ -203,7 +203,8 @@ XDrawText16(
 	    	elt->len = PartialNChars;
 
 		memcpy ((char *) (elt + 1), (char *)CharacterOffset,
-			PartialNChars * 2);
+			PartialNChars *
+2);
 	    }
 	}
     item++;

nx-X11/lib/X11/QuColors.c

@@ -97,4 +97,3 @@ XQueryColors(
     SyncHandle();
     return 1;
 }
-

nx-X11/lib/X11/RestackWs.c

@@ -57,3 +57,5 @@ XRestackWindows (
     }
 
 
+
+

nx-X11/lib/X11/SetCRects.c

@@ -78,3 +78,4 @@ XSetClipRectangles (
     SyncHandle();
     return 1;
 }
+

nx-X11/lib/X11/SetPntMap.c

@@ -74,3 +74,4 @@ XChangeKeyboardMapping (
     SyncHandle();
     return 0;
     }
+

nx-X11/lib/X11/StColor.c

@@ -51,6 +51,7 @@ XStoreColor(
     citem->blue = def->blue;
     citem->flags = def->flags; /* do_red, do_green, do_blue */
 
+
     UnlockDisplay(dpy);
     SyncHandle();
     return 1;

nx-X11/lib/X11/XKBGetMap.c

@@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-
 #define	NEED_MAP_READERS
 #ifdef HAVE_CONFIG_H
 #include <config.h>

nx-X11/lib/X11/XKBRdBuf.c

@@ -116,9 +116,7 @@ _XkbReadCopyData32(int *wire,long *to,int num_words)
     }
     return 1;
 }
-#endif
 
-#if defined(LONG64)
 int
 _XkbReadBufferCopy32(XkbReadBufferPtr from,long *to,int num_words)
 {
@@ -128,9 +126,7 @@ _XkbReadBufferCopy32(XkbReadBufferPtr from,long *to,int num_words)
     from->data+= (4*num_words);
     return True;
 }
-#endif
 
-#ifdef LONG64
 int
 _XkbWriteCopyData32 (register unsigned long *from,CARD32 *to,int len)
 {
@@ -142,6 +138,7 @@ _XkbWriteCopyData32 (register unsigned long *from,CARD32 *to,int len)
 }
 #endif /* LONG64 */
 
+
 char *
 _XkbPeekAtReadBuffer(XkbReadBufferPtr from,int size)
 {

nx-X11/lib/X11/XKBlibint.h

@@ -213,7 +213,7 @@ extern int _XkbCopyFromReadBuffer(
 );
 
 
-#if defined(LONG64)
+#ifdef LONG64
 extern	int _XkbReadCopyData32(
     int *		/* from */,
     long *		/* to */,

nx-X11/lib/X11/Xlibint.h

@@ -243,10 +243,6 @@ struct _XDisplay
 
 #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
 
-/*
- * define the following if you want the Data macro to be a procedure instead
- */
-
 #ifndef _XEVENT_
 /*
  * _QEvent datatype for use in input queueing.
@@ -445,6 +441,9 @@ extern LockInfoPtr _Xglobal_lock;
  * X Protocol packetizing macros.
  */
 
+/* Leftover from CRAY support - was defined empty on all non-Cray systems */
+#define WORD64ALIGN
+
 /**
  * Return a len-sized request buffer for the request type. This function may
  * flush the output queue.
@@ -593,7 +592,7 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
  * 32 bit word alignment.  Transmit if the buffer fills.
  *
  * "dpy" is a pointer to a Display.
- * "data" is a pinter to a data buffer.
+ * "data" is a pointer to a data buffer.
  * "len" is the length of the data buffer.
  */
 #ifndef DataRoutineIsProcedure
@@ -715,7 +714,6 @@ extern void _XRead32(
 }
 
 
-
 /* srcvar must be a variable for large architecture version */
 #define OneDataCard32(dpy,dstaddr,srcvar) \
   { *(CARD32 *)(dstaddr) = (srcvar); }
@@ -894,7 +892,7 @@ extern int _XError(
 );
 extern int _XIOError(
     Display*	/* dpy */
-);
+) _X_NORETURN;
 extern int (*_XIOErrorFunction)(
     Display*	/* dpy */
 );

nx-X11/lib/X11/Xprivate.h

@@ -10,10 +10,10 @@
 
 #include <nx-X11/Xlib.h>
 
-extern void _XIDHandler(Display *dpy);
-extern void _XSeqSyncFunction(Display *dpy);
-extern void _XSetPrivSyncFunction(Display *dpy);
-extern void _XSetSeqSyncFunction(Display *dpy);
+extern _X_HIDDEN void _XIDHandler(Display *dpy);
+extern _X_HIDDEN void _XSeqSyncFunction(Display *dpy);
+extern _X_HIDDEN void _XSetPrivSyncFunction(Display *dpy);
+extern _X_HIDDEN void _XSetSeqSyncFunction(Display *dpy);
 
 #ifdef XTHREADS
 #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

nx-X11/lib/X11/Xutil.h

@@ -50,7 +50,7 @@ SOFTWARE.
 #define _X11_XUTIL_H_
 #define _XUTIL_H_
 
-/* You must include <nx-X11/Xlib.h> before including this file */
+/* You must include <X11/Xlib.h> before including this file */
 #include <nx-X11/Xlib.h>
 #include <nx-X11/keysym.h>
 

nx-X11/lib/X11/imLcIm.c

@@ -36,9 +36,7 @@ THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-/*
-#include <nx-X11/Xlib.h>
-*/
+
 #include <nx-X11/Xmd.h>
 #include <nx-X11/Xatom.h>
 #include <nx-X11/Xos.h>

nx-X11/lib/X11/lcUniConv/big5hkscs.h

@@ -6249,3 +6249,4 @@ big5hkscs_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
   }
   return RET_TOOSMALL;
 }
+

nx-X11/lib/X11/omXChar.c

@@ -335,7 +335,6 @@ _XomConvert(
 
     length = *to_left - cs_left;
 
-    {
     if (font_set->side != charset->side) {
 	if (font_set->side == XlcGL)
 	    shift_to_gl(*to, length);
@@ -347,7 +346,6 @@ _XomConvert(
 	length >>= 1;
     *to = cs;
     *to_left -= length;
-    }
 
     *((XFontStruct **) args[0]) = font_set->font;
     *((Bool *) args[1]) = font_set->is_xchar2b;

nx-X11/lib/X11/pathmax.h

@@ -79,4 +79,3 @@ SOFTWARE.
 #endif
 #endif
 #endif
-

nx-X11/lib/X11/utlist.h

@@ -113,3 +113,4 @@ do {
     for(el=head,tmp=el->next;el;el=tmp,tmp=(el) ? (el->next) : NULL)
 
 #endif /* UTLIST_H */
+