Changeset 5210 for pjproject/branches/projects/uwp/pjlib/src/pj/os_info.c

Timestamp:

Dec 10, 2015 1:58:38 AM (8 years ago)

Author:

riza

Message:

Re #1900: Initial implementation with pjsua cli/telnet sample app.

File:

• pjproject/branches/projects/uwp/pjlib/src/pj/os_info.c (modified) (4 diffs)

pjproject/branches/projects/uwp/pjlib/src/pj/os_info.c

@@ -193 +193 @@
 #elif defined(_MSC_VER)
     {
+    #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8
+        si.os_name = pj_str("winphone");
+    #else
         OSVERSIONINFO ovi;
 
@@ -207 +210 @@
             si.os_name = pj_str("win32");
         #endif
+    #endif
     }
 
@@ -212 +216 @@
         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");
@@ -233 +243 @@
     #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