diff options
Diffstat (limited to 'pjlib/src/pj/os_info.c')
| -rw-r--r-- | pjlib/src/pj/os_info.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pjlib/src/pj/os_info.c b/pjlib/src/pj/os_info.c index 3bf11670..858deb08 100644 --- a/pjlib/src/pj/os_info.c +++ b/pjlib/src/pj/os_info.c @@ -196,6 +196,9 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void) #endif #elif defined(_MSC_VER) { + #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 + si.os_name = pj_str("winphone"); + #else OSVERSIONINFO ovi; ovi.dwOSVersionInfoSize = sizeof(ovi); @@ -210,21 +213,28 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void) #else si.os_name = pj_str("win32"); #endif + #endif } { SYSTEM_INFO wsi; + #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 + GetNativeSystemInfo(&wsi); + #else GetSystemInfo(&wsi); + #endif + switch (wsi.wProcessorArchitecture) { - #if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE + #if (defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE) || \ + (defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8) case PROCESSOR_ARCHITECTURE_ARM: si.machine = pj_str("arm"); break; case PROCESSOR_ARCHITECTURE_SHX: si.machine = pj_str("shx"); break; - #else + #else case PROCESSOR_ARCHITECTURE_AMD64: si.machine = pj_str("x86_64"); break; @@ -234,8 +244,12 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void) case PROCESSOR_ARCHITECTURE_INTEL: si.machine = pj_str("i386"); break; - #endif /* PJ_WIN32_WINCE */ + #endif /* PJ_WIN32_WINCE */ } + #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 + /* Avoid compile warning. */ + goto get_sdk_info; + #endif } #elif defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0 { |