Header file clean-up:

1. Remove all.h and PC_HEADER junk.
2. Rolled mem.c and mem.h into imports.c and imports.h
3. Include imports.h instead of mem.h
Restore _mesa_create/initialize_context() to be like they were in 4.0.4
New wrappers for a few std C functions: _mesa_atoi(), _mesa_strstr(), etc.

5 files changed, 10 insertions, 19 deletions

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index eb87837c9b6..a1fdf1dc871 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -1,4 +1,4 @@
-/* $Id: fxapi.c,v 1.34 2002/10/14 17:08:25 brianp Exp $ */
+/* $Id: fxapi.c,v 1.35 2002/10/24 23:57:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -283,7 +283,6 @@ fxMesaCreateContext(GLuint win,
    char *errorstr;
    GLboolean useBGR;
    char *system = NULL;
-   __GLimports imports;
 
    if (MESA_VERBOSE & VERBOSE_DRIVER) {
       fprintf(stderr, "fxmesa: fxMesaCreateContext() Start\n");
@@ -509,10 +508,9 @@ fxMesaCreateContext(GLuint win,
       goto errorhandler;
    }
 
-   _mesa_init_default_imports( &imports, (void *) fxMesa);
    ctx = fxMesa->glCtx = _mesa_create_context(fxMesa->glVis,
                                               shareCtx,
-					      &imports);
+					      (void *) fxMesa, GL_TRUE);
    if (!ctx) {
       errorstr = "_mesa_create_context";
       goto errorhandler;
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index 27e4f146b9c..d6d3be5b709 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -1,4 +1,4 @@
-/* $Id: fxdrv.h,v 1.53 2002/06/13 04:28:30 brianp Exp $ */
+/* $Id: fxdrv.h,v 1.54 2002/10/24 23:57:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -52,7 +52,6 @@
 #include "imports.h"
 #include "macros.h"
 #include "matrix.h"
-#include "mem.h"
 #include "mtypes.h"
 
 #include "GL/fxmesa.h"
diff --git a/src/mesa/drivers/glide/fxtris.c b/src/mesa/drivers/glide/fxtris.c
index dbe9d3d5c8b..bca894c8ec2 100644
--- a/src/mesa/drivers/glide/fxtris.c
+++ b/src/mesa/drivers/glide/fxtris.c
@@ -1,4 +1,4 @@
-/* $Id: fxtris.c,v 1.19 2002/08/21 02:56:58 brianp Exp $ */
+/* $Id: fxtris.c,v 1.20 2002/10/24 23:57:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -28,16 +28,10 @@
  *    Keith Whitwell <[email protected]>
  */
 
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
+#include "glheader.h"
 
 #ifdef FX
 
-#include <stdio.h>
-#include <math.h>
-
-#include "glheader.h"
 #include "mtypes.h"
 #include "macros.h"
 #include "colormac.h"
diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index 24e01af0960..00203f17fba 100644
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -1,4 +1,4 @@
-/* $Id: fxvb.c,v 1.14 2002/06/15 03:03:10 brianp Exp $ */
+/* $Id: fxvb.c,v 1.15 2002/10/24 23:57:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -37,7 +37,7 @@
 
 #include "glheader.h"
 #include "mtypes.h"
-#include "mem.h"
+#include "imports.h"
 #include "macros.h"
 #include "colormac.h"
 #include "mmath.h"
diff --git a/src/mesa/drivers/glide/fxwgl.c b/src/mesa/drivers/glide/fxwgl.c
index 11df0933663..ab6b1a1fe85 100644
--- a/src/mesa/drivers/glide/fxwgl.c
+++ b/src/mesa/drivers/glide/fxwgl.c
@@ -1,4 +1,4 @@
-/* $Id: fxwgl.c,v 1.15 2002/09/04 14:14:36 brianp Exp $ */
+/* $Id: fxwgl.c,v 1.16 2002/10/24 23:57:23 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -42,9 +42,9 @@ extern "C"
 {
 #endif
 
-#include "fxdrv.h"
 #include <windows.h>
-#include "GL/gl.h"
+#include "glheader.h"
+#include "fxdrv.h"
 #include "glapi.h"
 
 #ifdef __cplusplus