diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-01 00:55:53 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-07-01 15:56:28 +0200 |
| commit | 232c7ad9146ce372afc2a1682dd01e3d65916c53 (patch) | |
| tree | d348031a9f4b11d74d9b7ad651ae9fc781be9fb8 | |
| parent | e77e37ff0f97a5845fa0c634e978361541d7991f (diff) | |
| download | nx-libs-232c7ad9146ce372afc2a1682dd01e3d65916c53.tar.gz nx-libs-232c7ad9146ce372afc2a1682dd01e3d65916c53.tar.bz2 nx-libs-232c7ad9146ce372afc2a1682dd01e3d65916c53.zip | |
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.
| -rw-r--r-- | nx-X11/lib/X11/Xlib.h | 4 | ||||
| -rw-r--r-- | nx-X11/lib/X11/Xutil.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h index d4cecc7b5..86945a9e7 100644 --- 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 diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h index d3c991944..a50f254bb 100644 --- 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> |