XFree86 fixes (clib macro wrappers)

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index e227de976dcfb56f7d72786be1ffe48d628e28a7..8ce690722e93a852c6ce3888b6ac9ea1a4275619 100644 (file)
--- 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 );