Update to libx11 1.4.2. Tested by ajacoutot@, jasper@ krw@, landry@,

shadchin@ on various architectures.
Bump major.

12 files changed, 34 insertions, 42 deletions

diff --git a/lib/libX11/include/X11/ImUtil.h b/lib/libX11/include/X11/ImUtil.h
index 5b62571ac..ffdba1a93 100644
--- a/lib/libX11/include/X11/ImUtil.h
+++ b/lib/libX11/include/X11/ImUtil.h
@@ -1,6 +1,6 @@
 
-#ifndef _IMUTIL_H_
-#define _IMUTIL_H_
+#ifndef _X11_IMUTIL_H_
+#define _X11_IMUTIL_H_
 
 extern int
 _XGetScanlinePad(
@@ -27,4 +27,4 @@ extern void
 _XInitImageFuncPtrs(
     register XImage *image);
 
-#endif /* _IMUTIL_H_ */
+#endif /* _X11_IMUTIL_H_ */
diff --git a/lib/libX11/include/X11/XKBlib.h b/lib/libX11/include/X11/XKBlib.h
index 291fc0515..8f6c72c12 100644
--- a/lib/libX11/include/X11/XKBlib.h
+++ b/lib/libX11/include/X11/XKBlib.h
@@ -24,8 +24,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifndef _XKBLIB_H_
-#define _XKBLIB_H_
+#ifndef _X11_XKBLIB_H_
+#define _X11_XKBLIB_H_
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XKBstr.h>
@@ -1146,4 +1146,4 @@ extern void XkbUpdateKeyTypeVirtualMods(
 
 _XFUNCPROTOEND
 
-#endif /* _XKBLIB_H_ */
+#endif /* _X11_XKBLIB_H_ */
diff --git a/lib/libX11/include/X11/Xcms.h b/lib/libX11/include/X11/Xcms.h
index cea11ab48..8151fd1f3 100644
--- a/lib/libX11/include/X11/Xcms.h
+++ b/lib/libX11/include/X11/Xcms.h
@@ -26,8 +26,8 @@
  *	DESCRIPTION
  *		Public include file for X Color Management System
  */
-#ifndef _XCMS_H_
-#define _XCMS_H_
+#ifndef _X11_XCMS_H_
+#define _X11_XCMS_H_
 
 #include <X11/Xlib.h>
 
@@ -800,4 +800,4 @@ extern Visual *XcmsVisualOfCCC (
 
 _XFUNCPROTOEND
 
-#endif /* _XCMS_H_ */
+#endif /* _X11_XCMS_H_ */
diff --git a/lib/libX11/include/X11/Xlib-xcb.h b/lib/libX11/include/X11/Xlib-xcb.h
index 03d8f9867..a21e2bef0 100644
--- a/lib/libX11/include/X11/Xlib-xcb.h
+++ b/lib/libX11/include/X11/Xlib-xcb.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett
  * This file is licensed under the MIT license. See the file COPYING. */
 
-#ifndef XLIB_XCB_H
-#define XLIB_XCB_H
+#ifndef _X11_XLIB_XCB_H_
+#define _X11_XLIB_XCB_H_
 
 #include <xcb/xcb.h>
 #include <X11/Xlib.h>
@@ -17,4 +17,4 @@ void XSetEventQueueOwner(Display *dpy, enum XEventQueueOwner owner);
 
 _XFUNCPROTOEND
 
-#endif /* XLIB_XCB_H */
+#endif /* _X11_XLIB_XCB_H_ */
diff --git a/lib/libX11/include/X11/Xlib.h b/lib/libX11/include/X11/Xlib.h
index 7c8bc5154..5c6c77077 100644
--- a/lib/libX11/include/X11/Xlib.h
+++ b/lib/libX11/include/X11/Xlib.h
@@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group.
  *	interface library (Xlib) to the X Window System Protocol (V11).
  *	Structures and symbols starting with "_" are private to the library.
  */
-#ifndef _XLIB_H_
-#define _XLIB_H_
+#ifndef _X11_XLIB_H_
+#define _X11_XLIB_H_
 
 #define XlibSpecificationRelease 6
 
@@ -4020,4 +4020,4 @@ extern void XFreeEventData(
 
 _XFUNCPROTOEND
 
-#endif /* _XLIB_H_ */
+#endif /* _X11_XLIB_H_ */
diff --git a/lib/libX11/include/X11/XlibConf.h.in b/lib/libX11/include/X11/XlibConf.h.in
index b0796219d..8f36ac1d9 100644
--- a/lib/libX11/include/X11/XlibConf.h.in
+++ b/lib/libX11/include/X11/XlibConf.h.in
@@ -1,6 +1,4 @@
 /*
- * $Id: XlibConf.h.in,v 1.1 2006/11/25 16:36:56 matthieu Exp $
- *
  * Copyright © 2005 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/lib/libX11/include/X11/Xlibint.h b/lib/libX11/include/X11/Xlibint.h
index 0e97fd9c1..05d344ca9 100644
--- a/lib/libX11/include/X11/Xlibint.h
+++ b/lib/libX11/include/X11/Xlibint.h
@@ -27,8 +27,8 @@ from The Open Group.
 
 */
 
-#ifndef _XLIBINT_H_
-#define _XLIBINT_H_ 1
+#ifndef _X11_XLIBINT_H_
+#define _X11_XLIBINT_H_ 1
 
 /*
  *	Xlibint.h - Header definition and support file for the internal
@@ -220,12 +220,6 @@ typedef struct _XSQEvent
 } _XQEvent;
 #endif
 
-#ifdef XTHREADS			/* for xReply */
-#define NEED_REPLIES
-#endif
-
-#define NEED_EVENTS
-#define NEED_REPLIES
 #include <X11/Xproto.h>
 #ifdef __sgi
 #define _SGI_MP_SOURCE  /* turn this on to get MP safe errno */
@@ -632,7 +626,7 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
     if (dpy->bufptr + (n) > dpy->bufmax) \
         _XFlush (dpy); \
     ptr = (type) dpy->bufptr; \
-    (void)ptr; \
+    memset(ptr, '\0', n); \
     dpy->bufptr += (n);
 
 #ifdef WORD64
@@ -1400,4 +1394,4 @@ extern void xlocaledir(
 
 _XFUNCPROTOEND
 
-#endif /* _XLIBINT_H_ */
+#endif /* _X11_XLIBINT_H_ */
diff --git a/lib/libX11/include/X11/Xlocale.h b/lib/libX11/include/X11/Xlocale.h
index baa13353b..98946e53a 100644
--- a/lib/libX11/include/X11/Xlocale.h
+++ b/lib/libX11/include/X11/Xlocale.h
@@ -26,8 +26,8 @@ from The Open Group.
 
 */
 
-#ifndef _XLOCALE_H_
-#define _XLOCALE_H_
+#ifndef _X11_XLOCALE_H_
+#define _X11_XLOCALE_H_
 
 #include <X11/Xfuncproto.h>
 #include <X11/Xosdefs.h>
@@ -56,4 +56,4 @@ _XFUNCPROTOEND
 
 #endif /* X_LOCALE */
 
-#endif /* _XLOCALE_H_ */
+#endif /* _X11_XLOCALE_H_ */
diff --git a/lib/libX11/include/X11/Xregion.h b/lib/libX11/include/X11/Xregion.h
index 7b376e556..c25d70b41 100644
--- a/lib/libX11/include/X11/Xregion.h
+++ b/lib/libX11/include/X11/Xregion.h
@@ -45,8 +45,8 @@ SOFTWARE.
 
 ************************************************************************/
 
-#ifndef _XREGION_H
-#define _XREGION_H
+#ifndef _X11_XREGION_H_
+#define _X11_XREGION_H_
 
 typedef struct {
     short x1, x2, y1, y2;
@@ -186,4 +186,4 @@ typedef struct _POINTBLOCK {
     struct _POINTBLOCK *next;
 } POINTBLOCK;
 
-#endif
+#endif /* _X11_XREGION_H_ */
diff --git a/lib/libX11/include/X11/Xresource.h b/lib/libX11/include/X11/Xresource.h
index dbb144c27..6dbb3ce46 100644
--- a/lib/libX11/include/X11/Xresource.h
+++ b/lib/libX11/include/X11/Xresource.h
@@ -46,8 +46,8 @@ SOFTWARE.
 
 ******************************************************************/
 
-#ifndef _XRESOURCE_H_
-#define _XRESOURCE_H_
+#ifndef _X11_XRESOURCE_H_
+#define _X11_XRESOURCE_H_
 
 #ifndef _XP_PRINT_SERVER_
 #include <X11/Xlib.h>
@@ -354,5 +354,5 @@ extern void XrmParseCommand(
 
 _XFUNCPROTOEND
 
-#endif /* _XRESOURCE_H_ */
+#endif /* _X11_XRESOURCE_H_ */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/lib/libX11/include/X11/Xutil.h b/lib/libX11/include/X11/Xutil.h
index 8ff34d9f0..702823f51 100644
--- a/lib/libX11/include/X11/Xutil.h
+++ b/lib/libX11/include/X11/Xutil.h
@@ -46,8 +46,8 @@ SOFTWARE.
 
 ******************************************************************/
 
-#ifndef _XUTIL_H_
-#define _XUTIL_H_
+#ifndef _X11_XUTIL_H_
+#define _X11_XUTIL_H_
 
 /* You must include <X11/Xlib.h> before including this file */
 #include <X11/Xlib.h>
@@ -823,4 +823,4 @@ extern int XXorRegion(
 
 _XFUNCPROTOEND
 
-#endif /* _XUTIL_H_ */
+#endif /* _X11_XUTIL_H_ */
diff --git a/lib/libX11/include/X11/cursorfont.h b/lib/libX11/include/X11/cursorfont.h
index 70d71259b..c69d508f4 100644
--- a/lib/libX11/include/X11/cursorfont.h
+++ b/lib/libX11/include/X11/cursorfont.h
@@ -26,8 +26,8 @@ from The Open Group.
 
 */
 
-#ifndef _cursorfont_h_
-#define _cursorfont_h_
+#ifndef _X11_CURSORFONT_H_
+#define _X11_CURSORFONT_H_
 
 #define XC_num_glyphs 154
 #define XC_X_cursor 0
@@ -108,4 +108,4 @@ from The Open Group.
 #define XC_watch 150
 #define XC_xterm 152
 
-#endif /* _cursorfont_h_ */
+#endif /* _X11_CURSORFONT_H_ */