From 3f08d9604eeb060afdde24ea4d8fc7a8181d5fd3 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Tue, 16 Mar 2004 09:39:22 +0000
Subject: [PATCH] Further refinement of the Cygwin problem as suggested by
 Frederic.

---
 simgear/scene/sky/clouds3d/glut_shapes.c | 8 +-------
 simgear/scene/sky/clouds3d/glut_shapes.h | 9 ++-------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/simgear/scene/sky/clouds3d/glut_shapes.c b/simgear/scene/sky/clouds3d/glut_shapes.c
index e9c69f62..e8796cf4 100644
--- 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 9a02767a..42bd3061 100644
--- 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
-- 
2.39.5