diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-29 17:27:47 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-29 17:41:24 +0100 |
| commit | 9618380bde0b1e9bdc757055b378d93cac9d377f (patch) | |
| tree | cb98b6673722a65af86f753247f59b38fb44474c /nx-X11/include | |
| parent | eafc94f1692e68e988ce70600440ccd01aa47b5a (diff) | |
| download | nx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.tar.gz nx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.tar.bz2 nx-libs-9618380bde0b1e9bdc757055b378d93cac9d377f.zip | |
X11/nx-X11 clear-up: More places where we need to explicitly distinguish between X11 and nx-X11 namespace regarding header include paths.
Diffstat (limited to 'nx-X11/include')
| -rw-r--r-- | nx-X11/include/X.h | 2 | ||||
| -rw-r--r-- | nx-X11/include/Xos_r.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/include/X.h b/nx-X11/include/X.h index 0a9c501fb..2dbebdaea 100644 --- a/nx-X11/include/X.h +++ b/nx-X11/include/X.h @@ -81,7 +81,7 @@ typedef unsigned long Atom; /* Also in Xdefs.h */ typedef unsigned long VisualID; typedef unsigned long Time; #else -# include <X11/Xmd.h> +# include <nx-X11/Xmd.h> # ifndef _XTYPEDEF_XID # define _XTYPEDEF_XID typedef CARD32 XID; diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index 44b1eaacf..e7a8fd1af 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -72,8 +72,8 @@ in this Software without prior written authorization from The Open Group. #ifndef _XOS_R_H_ # define _XOS_R_H_ -# include <X11/Xos.h> -# include <X11/Xfuncs.h> +# include <nx-X11/Xos.h> +# include <nx-X11/Xfuncs.h> # ifndef X_NOT_POSIX # ifdef _POSIX_SOURCE @@ -107,7 +107,7 @@ extern LockInfoPtr _Xglobal_lock; # endif # if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) # ifndef XAllocIDs /* Xlibint.h does not have multiple include protection */ -# include <X11/Xfuncproto.h> /* for NeedFunctionPrototypes */ +# include <nx-X11/Xfuncproto.h> /* for NeedFunctionPrototypes */ extern void (*_XLockMutex_fn)( # if NeedFunctionPrototypes LockInfoPtr /* lock */, char * /* file */, int /* line */ @@ -129,7 +129,7 @@ extern void (*_XUnlockMutex_fn)( # endif # else # ifndef XAllocIDs /* Xlibint.h does not have multiple include protection */ -# include <X11/Xfuncproto.h> /* for NeedFunctionPrototypes */ +# include <nx-X11/Xfuncproto.h> /* for NeedFunctionPrototypes */ extern void (*_XLockMutex_fn)( # if NeedFunctionPrototypes LockInfoPtr /* lock */ @@ -155,7 +155,7 @@ extern void (*_XUnlockMutex_fn)( extern void (*_XtProcessLock)(void); # endif # ifndef _XtintrinsicP_h -# include <X11/Xfuncproto.h> /* for NeedFunctionPrototypes */ +# include <nx-X11/Xfuncproto.h> /* for NeedFunctionPrototypes */ extern void XtProcessLock( # if NeedFunctionPrototypes void |