Changeset 3436

Timestamp:

Mar 2, 2011 10:53:24 AM (13 years ago)

Author:

ming

Message:

Re #1202: Fixed compilation preprocessor for os_info so that it's more robust across various device and simulator SDKs.

Location:

pjproject/trunk/pjlib/src/pj

Files:

• os_info.c (modified) (1 diff)
• os_info_iphone.m (modified) (1 diff)

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

@@ -140 +140 @@
 #if defined(PJ_HAS_UNAME) && PJ_HAS_UNAME
     #if defined(PJ_DARWINOS) && PJ_DARWINOS != 0 && TARGET_OS_IPHONE && \
-        TARGET_IPHONE_SIMULATOR == 0
+        (!defined TARGET_IPHONE_SIMULATOR || TARGET_IPHONE_SIMULATOR == 0)
     {
         pj_str_t buf = {si_buffer + PJ_SYS_INFO_BUFFER_SIZE - left, left};

pjproject/trunk/pjlib/src/pj/os_info_iphone.m

@@ -18 +18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifdef TARGET_IPHONE_SIMULATOR == 0
+#include "TargetConditionals.h"
+
+#if !defined TARGET_IPHONE_SIMULATOR || TARGET_IPHONE_SIMULATOR == 0
 
 #include <pj/os.h>