From dbc94b3d56e4d50284064b3d2a84473ff7b8e5d4 Mon Sep 17 00:00:00 2001
From: fayjf <fayjf@7f0cb862-5218-0410-a997-914c9d46530a>
Date: Sun, 29 Jan 2012 13:14:08 +0000
Subject: [PATCH] Moving more Windows-specific header stuff over to the
 Windows-specific header file

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1029 7f0cb862-5218-0410-a997-914c9d46530a
---
 freeglut/freeglut/src/Common/freeglut_internal.h  | 15 ---------------
 .../freeglut/src/mswin/freeglut_internal_mswin.h  | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/freeglut/freeglut/src/Common/freeglut_internal.h b/freeglut/freeglut/src/Common/freeglut_internal.h
index d6d1743..bdb1c0b 100644
--- a/freeglut/freeglut/src/Common/freeglut_internal.h
+++ b/freeglut/freeglut/src/Common/freeglut_internal.h
@@ -148,21 +148,6 @@
 #    endif
 #endif
 
-#if TARGET_HOST_MS_WINDOWS
-#    define  HAVE_VFPRINTF 1
-#endif
-
-/* MinGW may lack a prototype for ChangeDisplaySettingsEx() (depending on the version?) */
-#if TARGET_HOST_MS_WINDOWS && !defined(ChangeDisplaySettingsEx)
-LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
-LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
-#    ifdef UNICODE
-#        define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
-#    else
-#        define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
-#    endif
-#endif
-
 #if defined(_MSC_VER) || defined(__WATCOMC__)
 /* strdup() is non-standard, for all but POSIX-2001 */
 #define strdup   _strdup
diff --git a/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h b/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
index a18efb2..78ad1fe 100644
--- a/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
+++ b/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
@@ -48,6 +48,21 @@
 #endif
 
 
+#define  HAVE_VFPRINTF 1
+
+/* MinGW may lack a prototype for ChangeDisplaySettingsEx() (depending on the version?) */
+#if !defined(ChangeDisplaySettingsEx)
+LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
+LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
+#    ifdef UNICODE
+#        define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
+#    else
+#        define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
+#    endif
+#endif
+
+
+/* Structure Definitions */
 
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
 struct tagSFG_PlatformDisplay