Re #1278: Fixed linker error on Mac and iOS.

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@3670 74dad513-b988-da41-8d7b-12977e46ad98

aconfigure.ac

@@ -408,9 +408,6 @@ case $target in
   *mingw* | *cygw* | *win32* | *w32* )
 	ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o"
 	;;
-  *darwin*)
-	ac_os_objs="$ac_os_objs os_core_darwin.o"
-	;;
   *)
 	ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o"
 	case $target in
@@ -427,7 +424,11 @@ case $target in
 	;;
 esac
 
-
+case $target in
+  *darwin*)
+	ac_os_objs="$ac_os_objs os_core_darwin.o"
+	;;
+esac
 
 dnl ##########################################
 dnl #

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

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