Implementation of re #1202 (PJLIB System Information API) on Win32 and Windows mobile targets
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@3424 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjlib/src/pj/os_info.c b/pjlib/src/pj/os_info.c
index 6259aaf..d82aea5 100644
--- a/pjlib/src/pj/os_info.c
+++ b/pjlib/src/pj/os_info.c
@@ -133,7 +133,7 @@
ovi.dwOSVersionInfoSize = sizeof(ovi);
- if (GetVersionInfoEx(&ovi) == FALSE)
+ if (GetVersionEx(&ovi) == FALSE)
goto get_sdk_info;
si.os_ver = (ovi.dwMajorVersion << 24) |
@@ -223,16 +223,16 @@
{
char tmp[PJ_SYS_INFO_BUFFER_SIZE];
char os_ver[20], sdk_ver[20];
- int len;
+ int cnt;
- len = pj_ansi_snprintf(tmp, sizeof(tmp),
+ cnt = pj_ansi_snprintf(tmp, sizeof(tmp),
"%s%s/%s/%s%s",
si.os_name.ptr,
ver_info(si.os_ver, os_ver),
si.machine.ptr,
si.sdk_name.ptr,
ver_info(si.sdk_ver, sdk_ver));
- if (len > 0 && len < sizeof(tmp)) {
+ if (cnt > 0 && cnt < (int)sizeof(tmp)) {
ALLOC_CP_STR(tmp, info);
}
}