Changeset 4777 for pjproject/branches/projects/winphone/pjlib/src/pj/os_info.c

Timestamp:

Mar 5, 2014 6:48:59 AM (10 years ago)

Author:

riza

Message:

Re #1704:

• Fix duplicate code on os_winphone.h
• Change the use of PJ_WIN32_WINPHONE to follow the code convention
• Fix incorrect link of the Thread library
• Handle exception raised from select() API. However the break window will still be shown when debugging on Visual Studio. To disable it, from Debug>Exceptions>Win32 Exceptions> unmark the "An invalid handle was specified” exception.

File:

• pjproject/branches/projects/winphone/pjlib/src/pj/os_info.c (modified) (3 diffs)

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

@@ -187 +187 @@
 #elif defined(_MSC_VER)
     {
-        #ifdef PJ_WIN32_WINPHONE
+        #if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE
             si.os_name = pj_str("winphone");
         #else
@@ -210 +210 @@
         SYSTEM_INFO wsi;
 
-    #ifdef PJ_WIN32_WINPHONE
+    #if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE
         GetNativeSystemInfo(&wsi);
     #else
@@ -238 +238 @@
     #endif      /* PJ_WIN32_WINCE || PJ_WIN32_WINPHONE */
         }
-    #ifdef PJ_WIN32_WINPHONE
+    #if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE
         /* Avoid compile warning. */
         goto get_sdk_info;