summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
authorGeorge Sapountzis <[email protected]>2007-04-05 19:00:47 +0300
committerGeorge Sapountzis <[email protected]>2007-04-05 19:00:47 +0300
commitaa1c79eaea96283e3ac7bae513b8d7535b875ce9 (patch)
tree3dc74927e324b67e88b1134f2892ed78871a8013 /src/glx
parent885111518eeb60664b2ac708512dc8b599060280 (diff)
glx: minor cosmetic in glcontextmodes.c
move memory macros to separate block and unwrap malloc/free for miniglx towards cleaning Mesa core glitches in glx...
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/x11/glcontextmodes.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/glx/x11/glcontextmodes.c b/src/glx/x11/glcontextmodes.c
index edb04463f61..c1651849031 100644
--- a/src/glx/x11/glcontextmodes.c
+++ b/src/glx/x11/glcontextmodes.c
@@ -32,20 +32,24 @@
*/
#if defined(IN_MINI_GLX)
+#include <GL/gl.h>
+#else
+#if defined(HAVE_DIX_CONFIG_H)
+# include <dix-config.h>
+#endif
+#include <X11/X.h>
+#include <GL/glx.h>
+#include "GL/glxint.h"
+#endif
+
+/* Memory macros */
+#if defined(IN_MINI_GLX)
# include <stdlib.h>
# include <string.h>
-# include <GL/gl.h>
-# include "GL/internal/dri_interface.h"
-# include "imports.h"
+# define _mesa_malloc(b) malloc(b)
+# define _mesa_free(m) free(m)
# define _mesa_memset memset
#else
-# if defined(HAVE_DIX_CONFIG_H)
-# include <dix-config.h>
-# endif
-# include <X11/X.h>
-# include <GL/glx.h>
-# include "GL/glxint.h"
-
# ifdef XFree86Server
# include <os.h>
# include <string.h>