fixing

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@290 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Library/FTP.c b/Library/FTP.c
index 833cdfcf647d2126aad7472323ae197d3b203154..9dfe6af13b87723e073d0b1bb4d21c955b44490b 100644 (file)
--- a/Library/FTP.c
+++ b/Library/FTP.c
@@ -40,8 +40,8 @@
 #include <string.h>
 
 #ifdef __MINGW32__
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #else
 #include <netdb.h>
 #include <netinet/in.h>

diff --git a/Library/Util.c b/Library/Util.c
index 979eda17ba3ccc961da9b8d52df3701c6a3edb25..13fcb37a03abb3018607f15c59288839f0bdaed0 100644 (file)
--- a/Library/Util.c
+++ b/Library/Util.c
@@ -40,9 +40,8 @@
 #include <string.h>
 
 #ifdef __MINGW32__
-#include <windows.h>
-#include <wdm.h>
 #include <winsock2.h>
+#include <windows.h>
 #else
 #include <netdb.h>
 #include <netinet/in.h>
@@ -151,10 +150,10 @@ bool __W3_Have_Header(struct W3* w3, const char* name) {
 
 char* __W3_Get_Platform(void) {
 #ifdef __MINGW32__
-       RTL_OSVERSIONINFOEXW info;
-       ZeroMemory(&info, sizeof(RTL_OSVERSIONINFOEXW));
-       info.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW);
-       RtlGetVersion(&info);
+       OSVERSIONINFOA info;
+       ZeroMemory(&info, sizeof(OSVERSIONINFOA));
+       info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
+       GetVersionEx(&info);
        char* result = malloc(33);
        sprintf(result, "Windows %lu.%lu.%lu", info.dwMajorVersion, info.dwMinorVersion, info.dwBuildNumber);
        return result;

diff --git a/W3Version.h.m4 b/W3Version.h.m4
index f2a306621117fbb5cb7889850a986a5cd9a2f57c..30f5f85cb813f4c045521a554beca146bd14a76f 100644 (file)
--- a/W3Version.h.m4
+++ b/W3Version.h.m4
@@ -60,7 +60,7 @@ const char* W3_Get_Version(void);
  * @note W3_Get_Version を使用することを検討してください。
  *
  */
-#define LIBW3_VERSION "2.22C" \
+#define LIBW3_VERSION "2.22D" \
 SUFFIX
 
 ifdef({{HTTP_SUPPORT}}, {{/**