Mesa (master): mapi: don't include X11/Xlib-xcb.h on non PTHREAD platforms

Timothy Arceri tarceri at kemper.freedesktop.org
Thu Mar 16 04:45:50 UTC 2017


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Thu Mar 16 15:43:48 2017 +1100

mapi: don't include X11/Xlib-xcb.h on non PTHREAD platforms

Should fix the last of the glthread build issues on windows.

---

 src/mapi/glapi/gen/gl_marshal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py
index 576d42c..fe03090 100644
--- a/src/mapi/glapi/gen/gl_marshal.py
+++ b/src/mapi/glapi/gen/gl_marshal.py
@@ -66,10 +66,10 @@ class PrintCode(gl_XML.gl_print_base):
 
     def printRealHeader(self):
         print header
-        print '#include <X11/Xlib-xcb.h>'
-        print
         print '#ifdef HAVE_PTHREAD'
         print
+        print '#include <X11/Xlib-xcb.h>'
+        print
         print 'static _X_INLINE int safe_mul(int a, int b)'
         print '{'
         print '    if (a < 0 || b < 0) return -1;'




More information about the mesa-commit mailing list