aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch
blob: 4f680373056ac529e0c7d79e2dd4c04800a2caca (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
Description: Turn glx_ansic.h into a no-op include. (by using memset, malloc, free directly)
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Index: Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
===================================================================
--- Mesa.orig/src/mesa/drivers/dri/common/glcontextmodes.c
+++ Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
@@ -48,15 +48,14 @@
 
 # ifdef XFree86Server
 #  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 <X11/Xlibint.h>
 #  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) */