aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-07-26 23:18:33 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-10 22:52:29 +0200
commitef5565f8ed86f05ca20ff1bfc5892fb8a2c557bc (patch)
tree27e3c3cd35c7d9460a67c586a980c8d415c41b8a
parent5930731421ae76931301302c515d75001b9f72a0 (diff)
downloadnx-libs-ef5565f8ed86f05ca20ff1bfc5892fb8a2c557bc.tar.gz
nx-libs-ef5565f8ed86f05ca20ff1bfc5892fb8a2c557bc.tar.bz2
nx-libs-ef5565f8ed86f05ca20ff1bfc5892fb8a2c557bc.zip
improve header guards
Upstream has changed the header guards. We adapt them to prevent double inclusion.
-rw-r--r--nx-X11/lib/X11/ImUtil.h5
-rw-r--r--nx-X11/lib/X11/XKBlib.h5
-rw-r--r--nx-X11/lib/X11/Xcms.h5
-rw-r--r--nx-X11/lib/X11/Xlib.h5
-rw-r--r--nx-X11/lib/X11/Xlibint.h7
-rw-r--r--nx-X11/lib/X11/Xlocale.h5
-rw-r--r--nx-X11/lib/X11/Xregion.h5
-rw-r--r--nx-X11/lib/X11/Xresource.h5
-rw-r--r--nx-X11/lib/X11/Xutil.h6
-rw-r--r--nx-X11/lib/X11/cursorfont.h6
10 files changed, 34 insertions, 20 deletions
diff --git a/nx-X11/lib/X11/ImUtil.h b/nx-X11/lib/X11/ImUtil.h
index 5b62571ac..a8b95eead 100644
--- a/nx-X11/lib/X11/ImUtil.h
+++ b/nx-X11/lib/X11/ImUtil.h
@@ -1,5 +1,6 @@
-#ifndef _IMUTIL_H_
+#if !defined(_X11_IMUTIL_H_) && !defined(_IM_UTIL_H_)
+#define _X11_IMUTIL_H_
#define _IMUTIL_H_
extern int
@@ -27,4 +28,4 @@ extern void
_XInitImageFuncPtrs(
register XImage *image);
-#endif /* _IMUTIL_H_ */
+#endif /* !defined(_X11_IMUTIL_H_) && !defined(_IM_UTIL_H_) */
diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/X11/XKBlib.h
index 95b233e84..b34054872 100644
--- a/nx-X11/lib/X11/XKBlib.h
+++ b/nx-X11/lib/X11/XKBlib.h
@@ -24,7 +24,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifndef _XKBLIB_H_
+#if !defined(_X11_XKBLIB_H_) && !defined(_XKBLIB_H_)
+#define _X11_XKBLIB_H_
#define _XKBLIB_H_
#include <nx-X11/Xlib.h>
@@ -1146,4 +1147,4 @@ extern void XkbUpdateKeyTypeVirtualMods(
_XFUNCPROTOEND
-#endif /* _XKBLIB_H_ */
+#endif /* !defined(_X11_XKBLIB_H_) && !defined(_XKBLIB_H_) */
diff --git a/nx-X11/lib/X11/Xcms.h b/nx-X11/lib/X11/Xcms.h
index 4ec2e4ead..70166cbbd 100644
--- a/nx-X11/lib/X11/Xcms.h
+++ b/nx-X11/lib/X11/Xcms.h
@@ -26,7 +26,8 @@
* DESCRIPTION
* Public include file for X Color Management System
*/
-#ifndef _XCMS_H_
+#if !defined(_X11_XCMS_H_) && !defined(_XCMS_H_)
+#define _X11_XCMS_H_
#define _XCMS_H_
#include <nx-X11/Xlib.h>
@@ -800,4 +801,4 @@ extern Visual *XcmsVisualOfCCC (
_XFUNCPROTOEND
-#endif /* _XCMS_H_ */
+#endif /* !defined(_X11_XCMS_H_) && !defined(_XCMS_H_) */
diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h
index c6851ecf8..883b1330f 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 /* #if !defined(_X11_XLIB_H_) && !defined(_XLIB_H_) */
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h
index a1daf25d9..ca004623d 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_
-#define _XLIBINT_H_ 1
+#if !defined(_X11_XLIBINT_H_) && !defined(_XLIBINT_H_)
+#define _X11_XLIBINT_H_
+#define _XLIBINT_H_
/*
* Xlibint.h - Header definition and support file for the internal
@@ -1437,4 +1438,4 @@ extern void xlocaledir(
_XFUNCPROTOEND
-#endif /* _XLIBINT_H_ */
+#endif /* !defined(_X11_XLIBINT_H_) && !defined(_XLIBINT_H_) */
diff --git a/nx-X11/lib/X11/Xlocale.h b/nx-X11/lib/X11/Xlocale.h
index 7b0b75bc2..da5746d28 100644
--- a/nx-X11/lib/X11/Xlocale.h
+++ b/nx-X11/lib/X11/Xlocale.h
@@ -26,7 +26,8 @@ from The Open Group.
*/
-#ifndef _XLOCALE_H_
+#if !defined(_X11_XLOCALE_H_) && !defined(_XLOCALE_H_)
+#define _X11_XLOCALE_H_
#define _XLOCALE_H_
#include <nx-X11/Xfuncproto.h>
@@ -56,4 +57,4 @@ _XFUNCPROTOEND
#endif /* X_LOCALE */
-#endif /* _XLOCALE_H_ */
+#endif /* !defined(_X11_XLOCALE_H_) && !defined(_XLOCALE_H_) */
diff --git a/nx-X11/lib/X11/Xregion.h b/nx-X11/lib/X11/Xregion.h
index f555a8dd9..40bc3a75e 100644
--- a/nx-X11/lib/X11/Xregion.h
+++ b/nx-X11/lib/X11/Xregion.h
@@ -45,7 +45,8 @@ SOFTWARE.
************************************************************************/
-#ifndef _XREGION_H
+#if !defined(_X11_XREGION_H_) && !defined(_XREGION_H)
+#define _X11_XREGION_H_
#define _XREGION_H
typedef struct {
@@ -186,4 +187,4 @@ typedef struct _POINTBLOCK {
struct _POINTBLOCK *next;
} POINTBLOCK;
-#endif
+#endif /* !defined(_X11_XREGION_H_) && !defined(_XREGION_H) */
diff --git a/nx-X11/lib/X11/Xresource.h b/nx-X11/lib/X11/Xresource.h
index c8c92a048..4a2e8d044 100644
--- a/nx-X11/lib/X11/Xresource.h
+++ b/nx-X11/lib/X11/Xresource.h
@@ -46,7 +46,8 @@ SOFTWARE.
******************************************************************/
-#ifndef _XRESOURCE_H_
+#if !defined(_X11_XRESOURCE_H_) && !defined(_XRESOURCE_H_)
+#define _X11_XRESOURCE_H_
#define _XRESOURCE_H_
#ifndef _XP_PRINT_SERVER_
@@ -354,5 +355,5 @@ extern void XrmParseCommand(
_XFUNCPROTOEND
-#endif /* _XRESOURCE_H_ */
+#endif /* !defined(_X11_XRESOURCE_H_) && !defined(_XRESOURCE_H_) */
/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h
index f42721244..99a6dccf7 100644
--- a/nx-X11/lib/X11/Xutil.h
+++ b/nx-X11/lib/X11/Xutil.h
@@ -46,9 +46,9 @@ SOFTWARE.
******************************************************************/
-#if !defined(_XUTIL_H_) && !defined(_X11_XUTIL_H_)
-#define _XUTIL_H_
+#if !defined(_X11_XUTIL_H_) && !defined(_XUTIL_H_)
#define _X11_XUTIL_H_
+#define _XUTIL_H_
/* You must include <nx-X11/Xlib.h> before including this file */
#include <nx-X11/Xlib.h>
@@ -823,4 +823,4 @@ extern int XXorRegion(
_XFUNCPROTOEND
-#endif /* _XUTIL_H_ */
+#endif /* !defined(_X11_XUTIL_H_) && !defined(_XUTIL_H_) */
diff --git a/nx-X11/lib/X11/cursorfont.h b/nx-X11/lib/X11/cursorfont.h
index 7b4c84dad..a0fbf3c6b 100644
--- a/nx-X11/lib/X11/cursorfont.h
+++ b/nx-X11/lib/X11/cursorfont.h
@@ -26,6 +26,10 @@ from The Open Group.
*/
+#if !defined(_X11_CURSORFONT_H_) && !defined(_cursorfont_h_)
+#define _X11_CURSORFONT_H_
+#define _cursorfont_h_
+
#define XC_num_glyphs 154
#define XC_X_cursor 0
#define XC_arrow 2
@@ -104,3 +108,5 @@ from The Open Group.
#define XC_ur_angle 148
#define XC_watch 150
#define XC_xterm 152
+
+#endif /* !defined(_X11_CURSORFONT_H_) && !defined(_cursorfont_h_) */