From 95755bba72d38add887fdf88f68381b8cfbbd405 Mon Sep 17 00:00:00 2001
From: Liong Sauw Ming <ming@teluu.com>
Date: Wed, 20 Jul 2011 03:00:48 +0000
Subject: Re #1278: Fixed linker error on Mac and iOS.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3670 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjlib/src/pj/os_core_darwin.m | 14 ++++++++++++++
 pjlib/src/pj/os_core_unix.c   |  2 ++
 2 files changed, 16 insertions(+)

(limited to 'pjlib')

diff --git a/pjlib/src/pj/os_core_darwin.m b/pjlib/src/pj/os_core_darwin.m
index 686d64be..7b21f872 100644
--- a/pjlib/src/pj/os_core_darwin.m
+++ b/pjlib/src/pj/os_core_darwin.m
@@ -17,6 +17,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 #include <pj/os.h>
+#include "TargetConditionals.h"
+
+#if TARGET_OS_IPHONE
+
+PJ_DEF(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[],
+                       unsigned flags)
+{
+    return (*main_func)(argc, argv);
+}
+
+#else
+
 #include <pthread.h>
 #include <AppKit/AppKit.h>
 #include <CoreFoundation/CFRunLoop.h>
@@ -84,3 +96,5 @@ PJ_DEF(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[],
     
     return param.retval;
 }
+
+#endif
diff --git a/pjlib/src/pj/os_core_unix.c b/pjlib/src/pj/os_core_unix.c
index fb0ba09e..1c8cb14e 100644
--- a/pjlib/src/pj/os_core_unix.c
+++ b/pjlib/src/pj/os_core_unix.c
@@ -1819,6 +1819,7 @@ PJ_DEF(pj_color_t) pj_term_get_color(void)
 
 #endif	/* PJ_TERM_HAS_COLOR */
 
+#if !defined(PJ_DARWINOS) || PJ_DARWINOS == 0
 /*
  * pj_run_app()
  */
@@ -1827,3 +1828,4 @@ PJ_DEF(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[],
 {
     return (*main_func)(argc, argv);
 }
+#endif
-- 
cgit v1.2.3