[Freeglut-cvs] SF.net SVN: freeglut:[1029] trunk/freeglut/freeglut/src

[<fa...@us...>]

Revision: 1029
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1029&view=rev
Author:   fayjf
Date:     2012-01-29 13:14:08 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving more Windows-specific header stuff over to the Windows-specific header file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 13:11:30 UTC (rev 1028)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 13:14:08 UTC (rev 1029)
@@ -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

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 13:11:30 UTC (rev 1028)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 13:14:08 UTC (rev 1029)
@@ -48,7 +48,22 @@
 #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
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.