diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-26 23:18:33 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-08-24 21:24:38 +0200 |
| commit | 15f943da9b96f485e82ce92ec2673e9b3b2ed58e (patch) | |
| tree | 59a16df1991efbe4c9768fbcf02727f26444ea00 | |
| parent | 2ebef6288467ce0f0583a0d0d2ef9afd637ee7e6 (diff) | |
| download | nx-libs-15f943da9b96f485e82ce92ec2673e9b3b2ed58e.tar.gz nx-libs-15f943da9b96f485e82ce92ec2673e9b3b2ed58e.tar.bz2 nx-libs-15f943da9b96f485e82ce92ec2673e9b3b2ed58e.zip | |
improve header guards
Upstream has changed the header guards. We adapt them to prevent double inclusion.
| -rw-r--r-- | nx-X11/lib/X11/XKBlib.h | 3 | ||||
| -rw-r--r-- | nx-X11/lib/X11/Xlib.h | 5 | ||||
| -rw-r--r-- | nx-X11/lib/X11/Xlibint.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/X11/XKBlib.h index 95b233e84..fc94b08b8 100644 --- a/nx-X11/lib/X11/XKBlib.h +++ b/nx-X11/lib/X11/XKBlib.h @@ -24,8 +24,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifndef _XKBLIB_H_ +#if !defined(_XKBLIB_H_) && !defined(_X11_XKBLIB_H) #define _XKBLIB_H_ +#define _X11_XKBLIB_H_ #include <nx-X11/Xlib.h> #include <nx-X11/extensions/XKBstr.h> diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h index c6851ecf8..6e70ba743 100644 --- a/nx-X11/lib/X11/Xlib.h +++ b/nx-X11/lib/X11/Xlib.h @@ -30,7 +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_ +#if !defined(_X11_XLIB_H_) && !defined(_XLIB_H_) +#define _X11_XLIB_H_ #define _XLIB_H_ #define XlibSpecificationRelease 6 @@ -4041,4 +4042,4 @@ extern void XFreeEventData( _XFUNCPROTOEND -#endif /* _XLIB_H_ */ +#endif /* _X11_XLIB_H_ */ diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index 20cfe1eaf..6763b8afe 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -51,8 +51,9 @@ from The Open Group. */ -#ifndef _XLIBINT_H_ +#if !defined(_XLIBINT_H_) && !defined(_X11_XLIBINT_H_) #define _XLIBINT_H_ 1 +#define _X11_XLIBINT_H_ 1 /* * Xlibint.h - Header definition and support file for the internal |