From 625d4f9446481f4a1684314cb559df7976090578 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Sun, 29 Jan 2012 02:29:16 +0000 Subject: [PATCH] Fixing the previous commit so we don't have a circular include. Under the new regime, the "freeglut_internal_mswin.h(platform).h" file will have only platform-specific definitions in it and will be included at the top of "freeglut_internal.h". git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1010 7f0cb862-5218-0410-a997-914c9d46530a --- src/mswin/freeglut_cursor_mswin.c | 2 +- src/mswin/freeglut_ext_mswin.c | 2 +- src/mswin/freeglut_gamemode_mswin.c | 2 +- src/mswin/freeglut_init_mswin.c | 2 +- src/mswin/freeglut_input_devices_mswin.c | 2 +- src/mswin/freeglut_internal_mswin.h | 2 -- src/mswin/freeglut_main_mswin.c | 2 +- src/mswin/freeglut_menu_mswin.c | 2 +- src/mswin/freeglut_state_mswin.c | 2 +- src/mswin/freeglut_structure_mswin.c | 2 +- src/mswin/freeglut_window_mswin.c | 2 +- 11 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/mswin/freeglut_cursor_mswin.c b/src/mswin/freeglut_cursor_mswin.c index 8dd7a4c..641a722 100644 --- a/src/mswin/freeglut_cursor_mswin.c +++ b/src/mswin/freeglut_cursor_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" diff --git a/src/mswin/freeglut_ext_mswin.c b/src/mswin/freeglut_ext_mswin.c index da35307..c08c840 100644 --- a/src/mswin/freeglut_ext_mswin.c +++ b/src/mswin/freeglut_ext_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" GLUTproc fgPlatformGlutGetProcAddress( const char* procName ) { diff --git a/src/mswin/freeglut_gamemode_mswin.c b/src/mswin/freeglut_gamemode_mswin.c index 9f31fe7..83acbac 100644 --- a/src/mswin/freeglut_gamemode_mswin.c +++ b/src/mswin/freeglut_gamemode_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" /* * Remembers the current visual settings, so that diff --git a/src/mswin/freeglut_init_mswin.c b/src/mswin/freeglut_init_mswin.c index d75765f..8627651 100644 --- a/src/mswin/freeglut_init_mswin.c +++ b/src/mswin/freeglut_init_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" diff --git a/src/mswin/freeglut_input_devices_mswin.c b/src/mswin/freeglut_input_devices_mswin.c index c0b795e..f92eadc 100644 --- a/src/mswin/freeglut_input_devices_mswin.c +++ b/src/mswin/freeglut_input_devices_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" #include #include diff --git a/src/mswin/freeglut_internal_mswin.h b/src/mswin/freeglut_internal_mswin.h index 1fadebc..b0697b5 100644 --- a/src/mswin/freeglut_internal_mswin.h +++ b/src/mswin/freeglut_internal_mswin.h @@ -30,7 +30,5 @@ -#include "..\Common\freeglut_internal.h" - #endif /* FREEGLUT_INTERNAL_MSWIN_H */ \ No newline at end of file diff --git a/src/mswin/freeglut_main_mswin.c b/src/mswin/freeglut_main_mswin.c index e233ecf..b4d1bc9 100644 --- a/src/mswin/freeglut_main_mswin.c +++ b/src/mswin/freeglut_main_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" extern void fghRedrawWindow ( SFG_Window *window ); diff --git a/src/mswin/freeglut_menu_mswin.c b/src/mswin/freeglut_menu_mswin.c index db15f14..3def1b9 100644 --- a/src/mswin/freeglut_menu_mswin.c +++ b/src/mswin/freeglut_menu_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) diff --git a/src/mswin/freeglut_state_mswin.c b/src/mswin/freeglut_state_mswin.c index 8a67c4b..ed1f57e 100644 --- a/src/mswin/freeglut_state_mswin.c +++ b/src/mswin/freeglut_state_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, diff --git a/src/mswin/freeglut_structure_mswin.c b/src/mswin/freeglut_structure_mswin.c index 6f2b883..228d618 100644 --- a/src/mswin/freeglut_structure_mswin.c +++ b/src/mswin/freeglut_structure_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" void fgPlatformCreateWindow ( SFG_Window *window ) diff --git a/src/mswin/freeglut_window_mswin.c b/src/mswin/freeglut_window_mswin.c index d53ba76..e5062b4 100644 --- a/src/mswin/freeglut_window_mswin.c +++ b/src/mswin/freeglut_window_mswin.c @@ -26,7 +26,7 @@ */ #include -#include "freeglut_internal_mswin.h" +#include "../Common/freeglut_internal.h" /* The following include file is available from SGI but is not standard: -- 1.7.10.4