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/lib/X11 | |
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/lib/X11')
-rw-r--r-- | nx-X11/lib/X11/XrmI.h | 2 | ||||
-rw-r--r-- | nx-X11/lib/X11/Xutil.h | 2 | ||||
-rw-r--r-- | nx-X11/lib/X11/imInsClbk.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/lib/X11/XrmI.h b/nx-X11/lib/X11/XrmI.h index 949bcd6f3..6178a634c 100644 --- a/nx-X11/lib/X11/XrmI.h +++ b/nx-X11/lib/X11/XrmI.h @@ -34,7 +34,7 @@ from The Open Group. * You may need to redefine these for various other operating systems. */ -#include <X11/Xos.h> +#include <nx-X11/Xos.h> #include <sys/stat.h> #define GetSizeOfFile(fd,size) \ diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h index 8c877e697..d3c991944 100644 --- a/nx-X11/lib/X11/Xutil.h +++ b/nx-X11/lib/X11/Xutil.h @@ -51,7 +51,7 @@ SOFTWARE. #ifndef _XUTIL_H_ #define _XUTIL_H_ -/* You must include <X11/Xlib.h> before including this file */ +/* You must include <nx-X11/Xlib.h> before including this file */ #include <nx-X11/Xlib.h> /* diff --git a/nx-X11/lib/X11/imInsClbk.c b/nx-X11/lib/X11/imInsClbk.c index ac39f9dfd..acf9f7b63 100644 --- a/nx-X11/lib/X11/imInsClbk.c +++ b/nx-X11/lib/X11/imInsClbk.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xatom.h> +#include <nx-X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" |