From eed6f691991ed0d64752fa712c83f67eb700b9ad Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 26 May 2000 16:17:00 +0000 Subject: [PATCH] include glheader.h instead of system headers --- src/mesa/drivers/glide/fxdrv.h | 10 +++------- src/mesa/drivers/osmesa/osmesa.c | 5 ++--- src/mesa/x86/x86.c | 8 ++------ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h index 79976042abf..c85c73d8e23 100644 --- a/src/mesa/drivers/glide/fxdrv.h +++ b/src/mesa/drivers/glide/fxdrv.h @@ -50,14 +50,10 @@ * you turn debugging on/off from the debugger. */ -#ifndef XFree86Server -#include -#include -#include -#include -#include -#else +#ifdef XFree86Server #include "GL/xf86glx.h" +#else +#include "glheader.h" #endif diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index ee00032b116..081dbc4e190 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -1,4 +1,4 @@ -/* $Id: osmesa.c,v 1.17 2000/05/26 14:44:59 brianp Exp $ */ +/* $Id: osmesa.c,v 1.18 2000/05/26 16:17:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -38,8 +38,7 @@ #ifdef PC_HEADER #include "all.h" #else -#include -#include +#include "glheader.h" #include "GL/osmesa.h" #include "context.h" #include "depth.h" diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c index 3696cd818ba..d6c4f31084c 100644 --- a/src/mesa/x86/x86.c +++ b/src/mesa/x86/x86.c @@ -1,4 +1,4 @@ -/* $Id: x86.c,v 1.6 2000/05/05 17:02:33 brianp Exp $ */ +/* $Id: x86.c,v 1.7 2000/05/26 16:17:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -29,11 +29,7 @@ */ -#include -#include -#include -#include - +#include "glheader.h" #include "context.h" #include "types.h" #include "vertices.h" -- 2.30.2