avoid conflicts when mixing own includes with upstream includes

We might better change all guard defines with the ones upstream is using but for now this should also work.

avoid conflicts when mixing own includes with upstream includes
232c7ad9 · Ulrich Sibiller · e77e37ff · 232c7ad9 · 232c7ad9
Commit 232c7ad9 authored Jul 01, 2016 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Xlib.h nx-X11/lib/X11/Xlib.h +3 -1

Xutil.h nx-X11/lib/X11/Xutil.h +2 -1

No files found.
--- a/nx-X11/lib/X11/Xlib.h
+++ b/nx-X11/lib/X11/Xlib.h
@@ -33,8 +33,10 @@ 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_
+
+#if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
 #define _XLIB_H_
+#define _X11_XLIB_H_

 #define XlibSpecificationRelease 6


--- a/nx-X11/lib/X11/Xutil.h
+++ b/nx-X11/lib/X11/Xutil.h
@@ -48,8 +48,9 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/lib/X11/Xutil.h,v 3.6 2003/04/13 19:22:20 dawes Exp $ */

-#ifndef _XUTIL_H_
+#if !defined(_XUTIL_H_) && !defined(_X11_XUTIL_H_)
 #define _XUTIL_H_
+#define _X11_XUTIL_H_

 /* You must include <nx-X11/Xlib.h> before including this file */
 #include <nx-X11/Xlib.h>