Просмотр исходного кода

WIN32_WINNT definition should really be in dtoolbase.h, not dtoolbase_cc.h

David Rose 22 лет назад
Родитель
Сommit
b6878df8c4
2 измененных файлов с 7 добавлено и 7 удалено
  1. 7 0
      dtool/src/dtoolbase/dtoolbase.h
  2. 0 7
      dtool/src/dtoolbase/dtoolbase_cc.h

+ 7 - 0
dtool/src/dtoolbase/dtoolbase.h

@@ -76,6 +76,13 @@
 #endif
 #endif
 #endif  /* WIN32_VC */
 #endif  /* WIN32_VC */
 
 
+/*
+  include win32 defns for everything up to WinServer2003, and assume
+  I'm smart enough to use GetProcAddress for backward compat on
+  w95/w98 for newer fns
+*/
+#define _WIN32_WINNT 0x0502
+
 #include "dtoolsymbols.h"
 #include "dtoolsymbols.h"
 
 
 #ifdef __GNUC__
 #ifdef __GNUC__

+ 0 - 7
dtool/src/dtoolbase/dtoolbase_cc.h

@@ -108,13 +108,6 @@ typedef ios::iostate ios_iostate;
 typedef ios::seekdir ios_seekdir;
 typedef ios::seekdir ios_seekdir;
 #endif
 #endif
 
 
-#ifdef WIN32_VC
-// include win32 defns for everything up to WinServer2003, and assume I'm smart
-// enough to use GetProcAddress for backward compat on w95/w98 for
-// newer fns
-#define _WIN32_WINNT 0x0502
-#endif  // WIN32_VC
-
 #if defined(WIN32_VC) && defined(FORCE_INLINING)
 #if defined(WIN32_VC) && defined(FORCE_INLINING)
 // If FORCE_INLINING is defined, we use the keyword __forceinline,
 // If FORCE_INLINING is defined, we use the keyword __forceinline,
 // which tells MS VC++ to override its internal benefit heuristic
 // which tells MS VC++ to override its internal benefit heuristic