Description: Turn glx_ansic.h into a no-op include. (by using memset, malloc, free directly) Author: Mike Gabriel --- a/src/mesa/drivers/dri/common/glcontextmodes.c +++ b/src/mesa/drivers/dri/common/glcontextmodes.c @@ -44,16 +44,17 @@ # include "GL/glxint.h" # ifdef XFree86Server +# include +# include # include "GL/glx_ansic.h" -extern void * __glXMalloc( size_t size ); -extern void __glXFree( void * ptr ); -# define _mesa_malloc(b) __glXMalloc(b) -# define _mesa_free(m) __glXFree(m) +# define __glXMemset memset +# define _mesa_malloc(b) malloc(b) +# define _mesa_free(m) free(m) # else # include # define __glXMemset memset -# define _mesa_malloc(b) Xmalloc(b) -# define _mesa_free(m) Xfree(m) +# define _mesa_malloc(b) malloc(b) +# define _mesa_free(m) free(m) # endif /* XFree86Server */ #endif /* !defined(IN_MINI_GLX) */