From 9618380bde0b1e9bdc757055b378d93cac9d377f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 29 Dec 2015 17:27:47 +0100 Subject: X11/nx-X11 clear-up: More places where we need to explicitly distinguish between X11 and nx-X11 namespace regarding header include paths. --- nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c') diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c index 066c5ffba..bb1c82794 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c +++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c @@ -39,7 +39,7 @@ # include "imports.h" # define __glXMemset memset #else -# include +# include # include # include "GL/glxint.h" @@ -51,7 +51,7 @@ extern void __glXFree( void * ptr ); # define _mesa_malloc(b) __glXMalloc(b) # define _mesa_free(m) __glXFree(m) # else -# include +# include # define __glXMemset memset # define _mesa_malloc(b) Xmalloc(b) # define _mesa_free(m) Xfree(m) -- cgit v1.2.3