From 232c7ad9146ce372afc2a1682dd01e3d65916c53 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 1 Jul 2016 00:55:53 +0200 Subject: avoid conflicts when mixing own includes with upstream includes We might better change all guard defines with the ones upstream is using but for now this should also work. --- nx-X11/lib/X11/Xlib.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nx-X11/lib/X11/Xlib.h') 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 -- cgit v1.2.3