summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11/xfonts.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-10-24 23:57:19 +0000
committerBrian Paul <[email protected]>2002-10-24 23:57:19 +0000
commit3c63452e64df7e10aa073c6c3b9492b1d7dabbb8 (patch)
tree87cc7c71b05da7a19f914368ded66e7bb8c00e8e /src/mesa/drivers/x11/xfonts.c
parentd0add7cf1a6b99cafd25e23fe2fc9d0b6657079a (diff)
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.
Diffstat (limited to 'src/mesa/drivers/x11/xfonts.c')
-rw-r--r--src/mesa/drivers/x11/xfonts.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 3aa17fec849..0f2dbbe1833 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,4 +1,4 @@
-/* $Id: xfonts.c,v 1.14 2001/04/26 19:28:02 brianp Exp $ */
+/* $Id: xfonts.c,v 1.15 2002/10/24 23:57:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -33,19 +33,9 @@
#include <GL/vms_x_fix.h>
#endif
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include "GL/gl.h"
-#include "GL/glx.h"
+#include "glxheader.h"
#include "context.h"
-#include "mem.h"
+#include "imports.h"
#include "xfonts.h"