Cygnus tools compatibility tweaks.

[simgear.git] / XGL / xgl.h

diff --git a/XGL/xgl.h b/XGL/xgl.h
index 9546127c658bed25b96561308658ead1f15410d8..434ab09d6ec862d0560b13667b152e124a6bc093 100644 (file)
--- a/XGL/xgl.h
+++ b/XGL/xgl.h
@@ -2,10 +2,20 @@
 #define _XGL_H
 
 
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <stdio.h>
 
+
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 /* xgl Utilities */
 
 extern FILE *xglTraceFd ;
@@ -464,10 +474,6 @@ glNormal3fv(f);\
 
 #else
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 GLboolean xglIsEnabled  ( GLenum cap ) ; 
 GLboolean xglIsList     ( GLuint list ) ; 
 GLenum    xglGetError   () ; 
@@ -820,10 +826,12 @@ void xglDeleteTexturesEXT           ( GLsizei n, GLuint *textures ) ;
 void xglGenTexturesEXT              ( GLsizei n, GLuint *textures ) ;
 void xglPrioritizeTexturesEXT       ( GLsizei n, GLuint *textures, GLclampf *priorities ) ;
 
-#ifdef __cplusplus
-}; 
 #endif
 
+
+#ifdef __cplusplus
+}
 #endif
 
+
 #endif /* _XGL_H */