diff options
| author | Keith Whitwell <[email protected]> | 1999-10-08 09:27:09 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 1999-10-08 09:27:09 +0000 |
| commit | 485f04074151686fa24d40e3eeb83029d3d8c425 (patch) | |
| tree | d74a44fb266d6534fbbc060be7658f9deefea538 /src/mesa/main/texobj.c | |
| parent | a7313e045dfd1ab439e8e01664d402ea9ce0a37e (diff) | |
Fixed includes & added a few hooks for the DRI.kw-mesa-1
Diffstat (limited to 'src/mesa/main/texobj.c')
| -rw-r--r-- | src/mesa/main/texobj.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index d94618d3407..0d2f5dd9f21 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1,4 +1,4 @@ -/* $Id: texobj.c,v 1.2 1999/09/30 11:18:22 keithw Exp $ */ +/* $Id: texobj.c,v 1.3 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -23,7 +23,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - +/* $XFree86: xc/lib/GL/mesa/src/texobj.c,v 1.3 1999/04/04 00:20:32 dawes Exp $ */ @@ -31,9 +31,13 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include <assert.h> #include <stdio.h> #include <stdlib.h> +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "enums.h" #include "hash.h" @@ -42,9 +46,6 @@ #include "texstate.h" #include "texobj.h" #include "types.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" -#endif #endif |