| 1 |
Description: Turn glx_ansic.h into a no-op include. (by using memset, malloc, free directly) |
| 2 |
Author: Mike Gabriel <[email protected]> |
| 3 |
|
| 4 |
--- a/src/mesa/drivers/dri/common/glcontextmodes.c |
| 5 |
+++ b/src/mesa/drivers/dri/common/glcontextmodes.c |
| 6 |
@@ -44,16 +44,17 @@ |
| 7 |
# include "GL/glxint.h" |
| 8 |
|
| 9 |
# ifdef XFree86Server |
| 10 |
+# include <stdlib.h> |
| 11 |
+# include <string.h> |
| 12 |
# include "GL/glx_ansic.h" |
| 13 |
-extern void * __glXMalloc( size_t size ); |
| 14 |
-extern void __glXFree( void * ptr ); |
| 15 |
-# define _mesa_malloc(b) __glXMalloc(b) |
| 16 |
-# define _mesa_free(m) __glXFree(m) |
| 17 |
+# define __glXMemset memset |
| 18 |
+# define _mesa_malloc(b) malloc(b) |
| 19 |
+# define _mesa_free(m) free(m) |
| 20 |
# else |
| 21 |
# include <X11/Xlibint.h> |
| 22 |
# define __glXMemset memset |
| 23 |
-# define _mesa_malloc(b) Xmalloc(b) |
| 24 |
-# define _mesa_free(m) Xfree(m) |
| 25 |
+# define _mesa_malloc(b) malloc(b) |
| 26 |
+# define _mesa_free(m) free(m) |
| 27 |
# endif /* XFree86Server */ |
| 28 |
#endif /* !defined(IN_MINI_GLX) */ |
| 29 |
|