From 232c7ad9146ce372afc2a1682dd01e3d65916c53 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
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/Xutil.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nx-X11/lib/X11/Xutil.h')

diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h
index d3c991944..a50f254bb 100644
--- a/nx-X11/lib/X11/Xutil.h
+++ b/nx-X11/lib/X11/Xutil.h
@@ -48,8 +48,9 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/lib/X11/Xutil.h,v 3.6 2003/04/13 19:22:20 dawes Exp $ */
 
-#ifndef _XUTIL_H_
+#if !defined(_XUTIL_H_) && !defined(_X11_XUTIL_H_)
 #define _XUTIL_H_
+#define _X11_XUTIL_H_
 
 /* You must include <nx-X11/Xlib.h> before including this file */
 #include <nx-X11/Xlib.h>
-- 
cgit v1.2.3