Further refinement of the Cygwin problem as suggested by Frederic.

diff --git a/simgear/scene/sky/clouds3d/glut_shapes.c b/simgear/scene/sky/clouds3d/glut_shapes.c
index e9c69f62b78a9a55b5102611adac94d7d1427e1a..e8796cf475f82c140a3fa42c7ecd69a73208f92b 100644 (file)
--- a/simgear/scene/sky/clouds3d/glut_shapes.c
+++ b/simgear/scene/sky/clouds3d/glut_shapes.c
@@ -48,17 +48,11 @@ OpenGL(TM) is a trademark of Silicon Graphics, Inc.
 #  include <simgear_config.h>
 #endif
 
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
+#include "glut_shapes.h"
 
 #include <math.h>
-
 #include <GL/glu.h>
 
-#include "glut_shapes.h"
 
 /* Some <math.h> files do not define M_PI... */
 #ifndef M_PI

diff --git a/simgear/scene/sky/clouds3d/glut_shapes.h b/simgear/scene/sky/clouds3d/glut_shapes.h
index 9a02767a5c507154ddba1b460e4fcba197a85f42..42bd306161b40e8702bda1158d0cca166161ae75 100644 (file)
--- a/simgear/scene/sky/clouds3d/glut_shapes.h
+++ b/simgear/scene/sky/clouds3d/glut_shapes.h
@@ -6,17 +6,12 @@
 #  include <simgear_config.h>
 #endif
 
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <GL/gl.h>
-
 #if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
 # include <windows.h>
 #endif
 
+#include <GL/gl.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif