Mesa (master): egl: Add a test for MESA_EGL_NO_X11_HEADERS.

Chia-I Wu olv at kemper.freedesktop.org
Wed Jun 23 00:15:59 PDT 2010


Module: Mesa
Branch: master
Commit: 985c2fca10b9338ef894cf8d34877dfbe7468e6e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=985c2fca10b9338ef894cf8d34877dfbe7468e6e

Author: Chia-I Wu <olv at lunarg.com>
Date:   Sat Jun 19 00:21:39 2010 +0800

egl: Add a test for MESA_EGL_NO_X11_HEADERS.

When the macro is defined, X11 headers will not be included.

---

 include/EGL/eglplatform.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
index c625088..33a3e5f 100644
--- a/include/EGL/eglplatform.h
+++ b/include/EGL/eglplatform.h
@@ -80,6 +80,14 @@ typedef void *EGLNativePixmapType;
 
 #elif defined(__unix__) || defined(__unix)
 
+#ifdef MESA_EGL_NO_X11_HEADERS
+
+typedef void            *EGLNativeDisplayType;
+typedef khronos_uint32_t EGLNativePixmapType;
+typedef khronos_uint32_t EGLNativeWindowType;
+
+#else
+
 /* X11 (tentative)  */
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -88,6 +96,8 @@ typedef Display *EGLNativeDisplayType;
 typedef Pixmap   EGLNativePixmapType;
 typedef Window   EGLNativeWindowType;
 
+#endif /* MESA_EGL_NO_X11_HEADERS */
+
 #else
 #error "Platform not recognized"
 #endif



More information about the mesa-commit mailing list