Add an "X11_" string to header guards to avoid possible collision

This addresses a build failure which can result from <X11/Xlocale.h> and
<xlocale.h> being included in the same code since they both used the same
_XLOCALE_H_ protection.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

11 files changed, 33 insertions, 33 deletions

diff --git a/include/X11/ImUtil.h b/include/X11/ImUtil.h
index 5b62571a..ffdba1a9 100644
--- a/include/X11/ImUtil.h
+++ b/include/X11/ImUtil.h
@@ -1,9 +1,9 @@
 
-#ifndef _IMUTIL_H_
-#define _IMUTIL_H_
+#ifndef _X11_IMUTIL_H_
+#define _X11_IMUTIL_H_
 
 extern int
 _XGetScanlinePad(
     Display *dpy,
     int depth);
 
@@ -24,7 +24,7 @@ _XReverse_Bytes(
     register unsigned char *bpt,
     register int nb);
 extern void
 _XInitImageFuncPtrs(
     register XImage *image);
 
-#endif /* _IMUTIL_H_ */
+#endif /* _X11_IMUTIL_H_ */
diff --git a/include/X11/XKBlib.h b/include/X11/XKBlib.h
index 291fc051..8f6c72c1 100644
--- a/include/X11/XKBlib.h
+++ b/include/X11/XKBlib.h
@@ -21,14 +21,14 @@ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 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>
 
 typedef struct _XkbAnyEvent {
 	int 		type;		/* XkbAnyEvent */
@@ -1143,7 +1143,7 @@ extern void XkbUpdateKeyTypeVirtualMods(
 	unsigned int		/* changed */,
 	XkbChangesPtr		/* changes */
 );
 
 _XFUNCPROTOEND
 
-#endif /* _XKBLIB_H_ */
+#endif /* _X11_XKBLIB_H_ */
diff --git a/include/X11/Xcms.h b/include/X11/Xcms.h
index cea11ab4..8151fd1f 100644
--- a/include/X11/Xcms.h
+++ b/include/X11/Xcms.h
@@ -23,14 +23,14 @@
  * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
  *
  *
  *	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>
 
     /*
      * XCMS Status Values
      */
@@ -797,7 +797,7 @@ extern Status XcmsTekHVCWhiteShiftColors(
 extern Visual *XcmsVisualOfCCC (
     XcmsCCC		/* ccc */
 );
 
 _XFUNCPROTOEND
 
-#endif /* _XCMS_H_ */
+#endif /* _X11_XCMS_H_ */
diff --git a/include/X11/Xlib-xcb.h b/include/X11/Xlib-xcb.h
index 03d8f986..a21e2bef 100644
--- a/include/X11/Xlib-xcb.h
+++ b/include/X11/Xlib-xcb.h
@@ -1,11 +1,11 @@
 /* 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>
 #include <X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
@@ -14,7 +14,7 @@ xcb_connection_t *XGetXCBConnection(Display *dpy);
 
 enum XEventQueueOwner { XlibOwnsEventQueue = 0, XCBOwnsEventQueue };
 void XSetEventQueueOwner(Display *dpy, enum XEventQueueOwner owner);
 
 _XFUNCPROTOEND
 
-#endif /* XLIB_XCB_H */
+#endif /* _X11_XLIB_XCB_H_ */
diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
index 7c8bc515..5c6c7707 100644
--- a/include/X11/Xlib.h
+++ b/include/X11/Xlib.h
@@ -27,14 +27,14 @@ in this Software without prior written authorization from The Open Group.
 
 /*
  *	Xlib.h - Header definition and support file for the C subroutine
  *	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
 
 #include <sys/types.h>
 
 #if defined(__SCO__) || defined(__UNIXWARE__)
@@ -4017,7 +4017,7 @@ extern void XFreeEventData(
     Display*			/* dpy */,
     XGenericEventCookie*	/* cookie*/
 );
 
 _XFUNCPROTOEND
 
-#endif /* _XLIB_H_ */
+#endif /* _X11_XLIB_H_ */
diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
index 77f0dc79..05d344ca 100644
--- a/include/X11/Xlibint.h
+++ b/include/X11/Xlibint.h
@@ -24,14 +24,14 @@ Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
 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
  *	support routines used by the C subroutine interface
  *	library (Xlib) to the X Window System.
  *
@@ -1391,7 +1391,7 @@ extern void xlocaledir(
     char *buf,
     int buf_len
 );
 
 _XFUNCPROTOEND
 
-#endif /* _XLIBINT_H_ */
+#endif /* _X11_XLIBINT_H_ */
diff --git a/include/X11/Xlocale.h b/include/X11/Xlocale.h
index baa13353..98946e53 100644
--- a/include/X11/Xlocale.h
+++ b/include/X11/Xlocale.h
@@ -23,14 +23,14 @@ Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
 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>
 
 #ifndef X_LOCALE
 #include <locale.h>
@@ -53,7 +53,7 @@ _XFUNCPROTOEND
 #define setlocale _Xsetlocale
 
 #include <stddef.h>
 
 #endif /* X_LOCALE */
 
-#endif /* _XLOCALE_H_ */
+#endif /* _X11_XLOCALE_H_ */
diff --git a/include/X11/Xregion.h b/include/X11/Xregion.h
index 7b376e55..c25d70b4 100644
--- a/include/X11/Xregion.h
+++ b/include/X11/Xregion.h
@@ -42,14 +42,14 @@ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
 ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ************************************************************************/
 
-#ifndef _XREGION_H
-#define _XREGION_H
+#ifndef _X11_XREGION_H_
+#define _X11_XREGION_H_
 
 typedef struct {
     short x1, x2, y1, y2;
 } Box, BOX, BoxRec, *BoxPtr;
 
 typedef struct {
@@ -183,7 +183,7 @@ typedef struct _XRegion {
  */
 typedef struct _POINTBLOCK {
     XPoint pts[NUMPTSTOBUFFER];
     struct _POINTBLOCK *next;
 } POINTBLOCK;
 
-#endif
+#endif /* _X11_XREGION_H_ */
diff --git a/include/X11/Xresource.h b/include/X11/Xresource.h
index dbb144c2..6dbb3ce4 100644
--- a/include/X11/Xresource.h
+++ b/include/X11/Xresource.h
@@ -43,14 +43,14 @@ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
 ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
 
-#ifndef _XRESOURCE_H_
-#define _XRESOURCE_H_
+#ifndef _X11_XRESOURCE_H_
+#define _X11_XRESOURCE_H_
 
 #ifndef _XP_PRINT_SERVER_
 #include <X11/Xlib.h>
 #endif
 
 /****************************************************************
@@ -351,8 +351,8 @@ extern void XrmParseCommand(
     int*		/* argc_in_out */,
     char**		/* argv_in_out */
 );
 
 _XFUNCPROTOEND
 
-#endif /* _XRESOURCE_H_ */
+#endif /* _X11_XRESOURCE_H_ */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/include/X11/Xutil.h b/include/X11/Xutil.h
index 8ff34d9f..702823f5 100644
--- a/include/X11/Xutil.h
+++ b/include/X11/Xutil.h
@@ -43,14 +43,14 @@ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
 ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 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>
 #include <X11/keysym.h>
 
 /*
@@ -820,7 +820,7 @@ extern int XXorRegion(
     Region		/* srb */,
     Region		/* dr_return */
 );
 
 _XFUNCPROTOEND
 
-#endif /* _XUTIL_H_ */
+#endif /* _X11_XUTIL_H_ */
diff --git a/include/X11/cursorfont.h b/include/X11/cursorfont.h
index 70d71259..c69d508f 100644
--- a/include/X11/cursorfont.h
+++ b/include/X11/cursorfont.h
@@ -23,14 +23,14 @@ Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
 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
 #define XC_arrow 2
 #define XC_based_arrow_down 4
 #define XC_based_arrow_up 6
@@ -105,7 +105,7 @@ from The Open Group.
 #define XC_ul_angle 144
 #define XC_umbrella 146
 #define XC_ur_angle 148
 #define XC_watch 150
 #define XC_xterm 152
 
-#endif /* _cursorfont_h_ */
+#endif /* _X11_CURSORFONT_H_ */