summaryrefslogtreecommitdiff
path: root/src/mesa/main/context.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-10-09 19:36:24 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-10-09 19:36:24 +0000
commitc20579d65162d8e1b4d10aca27c277d9dee068c2 (patch)
tree849a90a09200c04f4eda0f7bc879a9836d167858 /src/mesa/main/context.c
parentf2c5296dd7c990f566187621835414c3015058a1 (diff)
XFree86 fixes (clib macro wrappers)
Diffstat (limited to 'src/mesa/main/context.c')
-rw-r--r--src/mesa/main/context.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index e227de976d..8ce690722e 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.180 2002/10/08 23:59:33 brianp Exp $ */
+/* $Id: context.c,v 1.181 2002/10/09 19:36:24 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -77,6 +77,19 @@ int MESA_VERBOSE = 0;
int MESA_DEBUG_FLAGS = 0;
#endif
+/* XFree86 stuff */
+#ifdef getenv
+#undef getenv
+#endif
+#ifdef calloc
+#undef calloc
+extern void *calloc(size_t, size_t);
+#endif
+#ifdef free
+#undef free
+extern void free(void *);
+#endif
+
static void
free_shared_state( GLcontext *ctx, struct gl_shared_state *ss );