better user-agent

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

diff --git a/Library/Util.c b/Library/Util.c
index cfb0beaaaf6a22018c273fa3e7407af5e204f799..0d9d452d47124acae7647ac2710df1c305684d41 100644 (file)
--- a/Library/Util.c
+++ b/Library/Util.c
@@ -41,6 +41,7 @@
 
 #ifdef __MINGW32__
 #include <windows.h>
+#include <wdm.h>
 #include <winsock2.h>
 #else
 #include <netdb.h>
@@ -150,12 +151,12 @@ bool __W3_Have_Header(struct W3* w3, const char* name) {
 
 char* __W3_Get_Platform(void) {
 #ifdef __MINGW32__
-       OSVERSIONINFOEX info;
-       ZeroMemory(&info, sizeof(OSVERSIONINFOEX));
-       info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-       GetVersionEx(&info);
+       RTL_OSVERSIONINFOEXW info;
+       ZeroMemory(&info, sizeof(RTL_OSVERSIONINFOEXW));
+       info.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW);
+       RtlGetVersionEx(&info);
        char* result = malloc(33);
-       sprintf(result, "Windows %u.%u.%u", info.dwMajorVersion, info.dwMinorVersion, info.dwBuildNumber);
+       sprintf(result, "Windows %lu.%lu.%lu", info.dwMajorVersion, info.dwMinorVersion, info.dwBuildNumber);
        return result;
 #else
        struct utsname un;

diff --git a/W3Version.h.m4 b/W3Version.h.m4
index 6745075548e28adba7ea3f3e0d681cecf13aa02b..f2a306621117fbb5cb7889850a986a5cd9a2f57c 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.22B" \
+#define LIBW3_VERSION "2.22C" \
 SUFFIX
 
 ifdef({{HTTP_SUPPORT}}, {{/**