Changeset 5539 for pjproject/trunk/pjlib/src/pj/os_info.c

Timestamp:

Jan 23, 2017 4:32:34 AM (7 years ago)

Author:

nanang

Message:

Re #1900: Reintegrated works in UWP branch to trunk.

Location:

pjproject/trunk

Files:

• . (modified) (2 props)
• pjlib/src/pj/os_info.c (modified) (5 diffs)

pjproject/trunk/pjlib/src/pj/os_info.c

@@ -197 +197 @@
 #elif defined(_MSC_VER)
     {
+    #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8
+        si.os_name = pj_str("winphone");
+    #else
         OSVERSIONINFO ovi;
 
@@ -211 +214 @@
             si.os_name = pj_str("win32");
         #endif
+    #endif
     }
 
@@ -216 +220 @@
         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");
@@ -225 +235 @@
             si.machine = pj_str("shx");
             break;
-    #else
+        #else
         case PROCESSOR_ARCHITECTURE_AMD64:
             si.machine = pj_str("x86_64");
@@ -235 +245 @@
             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