From 3db0cf165981bc55c35bd215590b0f90212a860a Mon Sep 17 00:00:00 2001 From: fredb Date: Sun, 27 Jul 2008 15:18:34 +0000 Subject: [PATCH] Remove unneeded inclusions of windows.h, GL.h and GLU.H --- src/Cockpit/cockpit.cxx | 6 ------ src/Cockpit/hud.cxx | 6 ------ src/Cockpit/hud.hxx | 8 +++----- src/Cockpit/hud_rwy.cxx | 1 - src/Cockpit/panel.cxx | 6 ------ src/Cockpit/panel.hxx | 4 ---- src/Cockpit/panel_io.cxx | 4 ---- src/Cockpit/panel_io.hxx | 4 ---- src/Environment/environment.cxx | 4 ---- src/Environment/fgmetar.cxx | 4 ---- src/GUI/gui.cxx | 4 ---- src/GUI/gui.h | 4 ---- src/GUI/gui_funcs.cxx | 14 -------------- src/Input/input.cxx | 4 ---- src/Input/jssuper.h | 4 ---- src/Instrumentation/HUD/HUD.cxx | 6 ------ src/Instrumentation/render_area_2d.cxx | 6 ------ src/Main/bootstrap.cxx | 6 ------ src/Main/fg_commands.hxx | 4 ---- src/Main/main.cxx | 5 ----- src/Main/renderer.cxx | 4 ---- src/Network/lfsglass.cxx | 4 ---- src/Time/light.cxx | 6 ------ src/Time/light.hxx | 4 ---- 24 files changed, 3 insertions(+), 119 deletions(-) diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx index b9e97281e..e9eb1fc7f 100644 --- a/src/Cockpit/cockpit.cxx +++ b/src/Cockpit/cockpit.cxx @@ -25,14 +25,8 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include -#include SG_GLU_H - #include #include #include diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx index ad5165959..8357cbb67 100644 --- a/src/Cockpit/hud.cxx +++ b/src/Cockpit/hud.cxx @@ -30,17 +30,11 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include #include // char related functions #include // strcmp() -#include SG_GLU_H - #include #include #include diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx index 0e33f411a..9782e7f59 100644 --- a/src/Cockpit/hud.hxx +++ b/src/Cockpit/hud.hxx @@ -34,10 +34,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #ifdef __CYGWIN__ #include #endif @@ -50,7 +46,9 @@ #include // STL double ended queue #include -#include +namespace osg { + class State; +} #include #include diff --git a/src/Cockpit/hud_rwy.cxx b/src/Cockpit/hud_rwy.cxx index 6a3a90ac4..e1b1692db 100644 --- a/src/Cockpit/hud_rwy.cxx +++ b/src/Cockpit/hud_rwy.cxx @@ -32,7 +32,6 @@ #include #include #include -#include SG_GLU_H #include diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx index 5be11a20e..b529b0372 100644 --- a/src/Cockpit/panel.cxx +++ b/src/Cockpit/panel.cxx @@ -31,10 +31,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include // sprintf #include @@ -46,8 +42,6 @@ #include -#include SG_GLU_H - #include #include diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx index a8241b9d4..0b9f71906 100644 --- a/src/Cockpit/panel.hxx +++ b/src/Cockpit/panel.hxx @@ -30,10 +30,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include #include diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx index 37b383ed9..418267f23 100644 --- a/src/Cockpit/panel_io.cxx +++ b/src/Cockpit/panel_io.cxx @@ -22,10 +22,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include // for strcmp() #include diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx index 0cb6df674..5d5fd09fb 100644 --- a/src/Cockpit/panel_io.hxx +++ b/src/Cockpit/panel_io.hxx @@ -25,10 +25,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx index 026ebdcb8..3e50bb459 100644 --- a/src/Environment/environment.cxx +++ b/src/Environment/environment.cxx @@ -25,10 +25,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include diff --git a/src/Environment/fgmetar.cxx b/src/Environment/fgmetar.cxx index d12d00189..c172d92a7 100644 --- a/src/Environment/fgmetar.cxx +++ b/src/Environment/fgmetar.cxx @@ -36,10 +36,6 @@ #include #endif -#ifdef HAVE_WINDOWS_H -#include -#endif - #include #include #include
diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx index 09fc0f782..77c98d9ed 100644 --- a/src/GUI/gui.cxx +++ b/src/GUI/gui.cxx @@ -30,10 +30,6 @@ #include -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include diff --git a/src/GUI/gui.h b/src/GUI/gui.h index f778349dd..aeb786167 100644 --- a/src/GUI/gui.h +++ b/src/GUI/gui.h @@ -29,10 +29,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx index 833649411..0428f7304 100644 --- a/src/GUI/gui_funcs.cxx +++ b/src/GUI/gui_funcs.cxx @@ -32,12 +32,6 @@ #include -#ifdef HAVE_WINDOWS_H -# include -#endif - -#include SG_GL_H - #include #include #include @@ -45,14 +39,6 @@ #include -// for help call back -#ifdef WIN32 -# include -# ifdef __CYGWIN__ -# include -# endif -#endif - #include #include #include diff --git a/src/Input/input.cxx b/src/Input/input.cxx index 5db934f74..21d96e658 100644 --- a/src/Input/input.cxx +++ b/src/Input/input.cxx @@ -24,10 +24,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include diff --git a/src/Input/jssuper.h b/src/Input/jssuper.h index 94a4f752e..3b395c4cd 100644 --- a/src/Input/jssuper.h +++ b/src/Input/jssuper.h @@ -25,10 +25,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include // plib/js.h should really include this !!!!!! #include diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx index 28fe5d994..53a688e23 100644 --- a/src/Instrumentation/HUD/HUD.cxx +++ b/src/Instrumentation/HUD/HUD.cxx @@ -29,12 +29,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - -#include SG_GLU_H - #include #include diff --git a/src/Instrumentation/render_area_2d.cxx b/src/Instrumentation/render_area_2d.cxx index d0dbdf6e1..e1155fb68 100644 --- a/src/Instrumentation/render_area_2d.cxx +++ b/src/Instrumentation/render_area_2d.cxx @@ -26,14 +26,8 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include "render_area_2d.hxx" -#include SG_GL_H - static const float dummy_normals[][3] = {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx index 9e4a57513..e9394211a 100644 --- a/src/Main/bootstrap.cxx +++ b/src/Main/bootstrap.cxx @@ -46,12 +46,6 @@ SG_USING_STD(endl); #include "globals.hxx" -#ifdef HAVE_WINDOWS_H -# include -# include -# include -#endif - #include "fg_os.hxx" char *homedir = ::getenv( "HOME" ); diff --git a/src/Main/fg_commands.hxx b/src/Main/fg_commands.hxx index 78342163c..1694ca02c 100644 --- a/src/Main/fg_commands.hxx +++ b/src/Main/fg_commands.hxx @@ -12,10 +12,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 56204bff1..92b24b0ae 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -32,11 +32,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -# include -#endif - #include #include diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx index f40a50452..368dba642 100644 --- a/src/Main/renderer.cxx +++ b/src/Main/renderer.cxx @@ -25,10 +25,6 @@ #include -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include #include diff --git a/src/Network/lfsglass.cxx b/src/Network/lfsglass.cxx index a1ca7e97b..e8e6adbb9 100644 --- a/src/Network/lfsglass.cxx +++ b/src/Network/lfsglass.cxx @@ -31,10 +31,6 @@ #include #endif -#ifdef HAVE_WINDOWS_H -#include -#endif - #include #include diff --git a/src/Time/light.cxx b/src/Time/light.cxx index cb15cff85..800ddf687 100644 --- a/src/Time/light.cxx +++ b/src/Time/light.cxx @@ -26,14 +26,8 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include -#include SG_GL_H - #include #include diff --git a/src/Time/light.hxx b/src/Time/light.hxx index 84c32aa90..ab256eed8 100644 --- a/src/Time/light.hxx +++ b/src/Time/light.hxx @@ -34,10 +34,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include #include -- 2.39.5