From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 16 Mar 2017 11:05:23 +0000 (+0000)
Subject: mapi: remove Xlib/xcb include in gl_marshal.py
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c81c563fbbb06b6f1dd06ed62f252ed28d45be5a;p=mesa.git

mapi: remove Xlib/xcb include in gl_marshal.py

The only use of the header is to provide the _X_INLINE macro. We already
require (and provide where needed) 'inline', plus it's used in the file
already.

So replace the macro and drop the include. This fixes the build on
platforms which lack the header - from X-less Linuxes to Androids.

Fixes: 05dd4a1104e ("glapi: Generate GL API marshalling code from the XML.")
Reported-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100223
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py
index fe030901859..c89d3970c20 100644
--- a/src/mapi/glapi/gen/gl_marshal.py
+++ b/src/mapi/glapi/gen/gl_marshal.py
@@ -68,9 +68,7 @@ class PrintCode(gl_XML.gl_print_base):
         print header
         print '#ifdef HAVE_PTHREAD'
         print
-        print '#include <X11/Xlib-xcb.h>'
-        print
-        print 'static _X_INLINE int safe_mul(int a, int b)'
+        print 'static inline int safe_mul(int a, int b)'
         print '{'
         print '    if (a < 0 || b < 0) return -1;'
         print '    if (a == 0 || b == 0) return 0;'