Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / glut / glx / glutint.h

diff --git a/src/glut/glx/glutint.h b/src/glut/glx/glutint.h
index b0d6c86b7c42fc97ee5c50e936306da34b06e8e5..de506a5932d83a85a257673149cc3305adf17d63 100644 (file)
--- a/src/glut/glx/glutint.h
+++ b/src/glut/glx/glutint.h
@@ -26,11 +26,14 @@
 #include <GL/glx.h>
 #endif
 
+#ifndef GLUT_BUILDING_LIB
 #define GLUT_BUILDING_LIB  /* Building the GLUT library itself. */
+#endif
+
 #include <GL/glut.h>
 
 #if defined(MESA) && defined(_WIN32) && !defined(__CYGWIN32__)
-#include <gl/mesa_wgl.h>
+#include <GL/mesa_wgl.h>
 #endif
 
 #ifndef _WIN32
@@ -796,7 +799,12 @@ extern void  __glutUpdateInputDeviceMask(GLUTwindow * window);
 extern void __glutDetermineMesaSwapHackSupport(void);
 
 /* private routines from glut_gameglut.c */
-extern void GLUTAPIENTRYV __glutCloseDownGameMode(void);
+extern void __glutCloseDownGameMode(void);
+
+/* private variables from glut_swap.c (BrianP) */
+extern GLint __glutFPS;
+extern GLint __glutSwapCount;
+extern GLint __glutSwapTime;
 
 #if defined(_WIN32)
 /* private routines from win32_*.c */