diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:00:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:00:04 +0200 |
| commit | da7261cfe0244fcf329e0597f9d122293fd4f9eb (patch) | |
| tree | fe39b99fe89ac4fa65fec9c974379b5c52ada016 /nx-X11/lib/X11 | |
| parent | 2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1 (diff) | |
| parent | 1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf (diff) | |
| download | nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.tar.gz nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.tar.bz2 nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.zip | |
Merge branch 'uli42-pr/drop_libNX_Xext' into 3.6.x
Attributes GH PR #175: https://github.com/ArcticaProject/nx-libs/pull/175
Diffstat (limited to 'nx-X11/lib/X11')
| -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> |