added GL_SGIX/SGIS_pixel_texture

[mesa.git] / src / mesa / main / glheader.h

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 7041f7985acc6cb6c62977d0c4b9ccbbc604aed2..908ffe9b3c8d8fc7864afcd5ebc920c34358553a 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -1,10 +1,10 @@
-/* $Id: glheader.h,v 1.3 1999/11/12 18:23:47 brianp Exp $ */
+/* $Id: glheader.h,v 1.7 2000/03/22 23:20:12 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -47,19 +47,24 @@
 #else
 #include <assert.h>
 #include <ctype.h>
-#include <float.h>
 #include <math.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#if defined(__linux__) && defined(__i386__) 
+#include <fpu_control.h>
+#endif
 #endif
+#include <float.h>
+
 
 #ifdef HAVE_CONFIG_H
 #include "conf.h"
 #endif
 
-#include <GL/gl.h>
+#include "GL/gl.h"
+#include "GL/glext.h"
 
 
 /*