diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-02-28 08:28:48 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-02-28 08:28:48 +0000 |
| commit | becc875a5dafe43a6067b6fb5e0c953c582fad48 (patch) | |
| tree | a72bbb7465e7c45a8bf9939e45025a4fd181ade2 /pjlib/src | |
| parent | d62ff46dee0080e4470c03496614245f23c68a2d (diff) | |
Implementation of re #1202 (PJLIB System Information API) on Win32 and Windows mobile targets
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3424 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src')
| -rw-r--r-- | pjlib/src/pj/os_info.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pjlib/src/pj/os_info.c b/pjlib/src/pj/os_info.c index 6259aafa..d82aea5c 100644 --- a/pjlib/src/pj/os_info.c +++ b/pjlib/src/pj/os_info.c @@ -133,7 +133,7 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void) 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 @@ get_sdk_info: { 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); } } |