From c81c563fbbb06b6f1dd06ed62f252ed28d45be5a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 16 Mar 2017 11:05:23 +0000 Subject: [PATCH] mapi: remove Xlib/xcb include in gl_marshal.py MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Timothy Arceri Reviewed-by: Tapani Pälli Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100223 Signed-off-by: Emil Velikov --- src/mapi/glapi/gen/gl_marshal.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 ' - 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;' -- 2.11.0