Mac OS X fixes from Markus Morawitz

[simgear.git] / simgear / screen / GLBitmaps.cxx

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index 225f5cb9e7ae93637ed98796664699c9ea9eef89..a490a4d0bdc3ff4262bee9b079c1093e98406d5b 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -1,17 +1,23 @@
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>                     
+#if defined(__CYGWIN__)  /* && !defined(USING_X) */
+#define WIN32
+#endif
+
+#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+# include <windows.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <string.h>            // memcpy()
+
+#include <simgear/compiler.h>
 
-#include <GL/glut.h>
-#include <simgear/xgl.h>
+#include SG_GL_H
 
 #include "GLBitmaps.h"