From: ski <ski@opencascade.com>
Date: Fri, 20 Mar 2015 08:27:57 +0000 (+0300)
Subject: 0025150: Java wrapper
X-Git-Tag: V6_9_0_beta~18
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=2905ff1727bf6ce7863fb96124cbc6eed1a6a3bf;p=occt-copy.git

0025150: Java wrapper

Workaround name conflicts with OCCT methods for Java wrapper compilation
---

diff --git a/src/Aspect/Aspect_DisplayConnection.hxx b/src/Aspect/Aspect_DisplayConnection.hxx
index eb80fcacd1..bfbd7a6ab0 100755
--- a/src/Aspect/Aspect_DisplayConnection.hxx
+++ b/src/Aspect/Aspect_DisplayConnection.hxx
@@ -22,7 +22,7 @@
 #include <NCollection_DataMap.hxx>
 
 #if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)
-  #include <X11/Xlib.h>
+  #include <InterfaceGraphic.hxx>
 #endif
 
 //! This class creates and provides connection with X server.