Re #1446 (misc): Disable SDL by default on iOS and fixed various compiler warnings.

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

6 files changed, 15 insertions, 3 deletions

diff --git a/configure-iphone b/configure-iphone
index e7e4f203..742dce08 100755
--- a/configure-iphone
+++ b/configure-iphone
@@ -133,7 +133,7 @@ if test "1" = "1"; then
 fi
 
 # And finally invoke the configure script itself
-./aconfigure --host=arm-apple-darwin9 --disable-floating-point $*
+./aconfigure --host=arm-apple-darwin9 --disable-floating-point --disable-sdl $*
 
 if test "$?" = "0"; then
   echo "Done configuring for `basename $SDKPATH`"
diff --git a/pjmedia/src/pjmedia/converter.c b/pjmedia/src/pjmedia/converter.c
index 14496fa0..436f0bd3 100644
--- a/pjmedia/src/pjmedia/converter.c
+++ b/pjmedia/src/pjmedia/converter.c
@@ -39,7 +39,7 @@ PJ_DEF(pj_status_t) pjmedia_converter_mgr_create(pj_pool_t *pool,
 					         pjmedia_converter_mgr **p_mgr)
 {
     pjmedia_converter_mgr *mgr;
-    pj_status_t status;
+    pj_status_t status = PJ_SUCCESS;
 
     mgr = PJ_POOL_ALLOC_T(pool, pjmedia_converter_mgr);
     pj_list_init(&mgr->factory_list);
diff --git a/pjmedia/src/pjmedia/format.c b/pjmedia/src/pjmedia/format.c
index 54fd4dba..49369c0b 100644
--- a/pjmedia/src/pjmedia/format.c
+++ b/pjmedia/src/pjmedia/format.c
@@ -53,6 +53,10 @@ pjmedia_format_get_audio_format_detail(const pjmedia_format *fmt,
     if (fmt->detail_type==PJMEDIA_FORMAT_DETAIL_AUDIO) {
 	return (pjmedia_audio_format_detail*) &fmt->det.aud;
     } else {
+        /* Get rid of unused var compiler warning if pj_assert()
+         * macro does not do anything
+         */
+        PJ_UNUSED_ARG(assert_valid);
 	pj_assert(!assert_valid || !"Invalid audio format detail");
 	return NULL;
     }
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index ee25718d..810197e4 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -3371,6 +3371,9 @@ static void on_call_media_event(pjsua_call_id call_id,
 	/* Re-arrange video windows */
 	arrange_window(PJSUA_INVALID_ID);
     }
+#else
+    PJ_UNUSED_ARG(med_idx);
+    PJ_UNUSED_ARG(event);
 #endif
 }
 
diff --git a/pjsip-apps/src/pjsystest/systest.c b/pjsip-apps/src/pjsystest/systest.c
index 0ee08b67..63ca849d 100644
--- a/pjsip-apps/src/pjsystest/systest.c
+++ b/pjsip-apps/src/pjsystest/systest.c
@@ -88,12 +88,16 @@ static gui_menu root_menu = {
 
 /*****************************************************************/
 
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
 PJ_INLINE(char *) add_path(const char *path, const char *fname)
 {
     strncpy(fpath, path, PATH_LENGTH);
     strncat(fpath, fname, PATH_LENGTH);
     return fpath;
 }
+#else
+#   define add_path(path, fname) fname
+#endif
 
 static void exit_app(void)
 {
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c
index 394ac0b4..be8f7fa7 100644
--- a/pjsip/src/pjsua-lib/pjsua_media.c
+++ b/pjsip/src/pjsua-lib/pjsua_media.c
@@ -2654,10 +2654,10 @@ PJ_DEF(pj_status_t) pjsua_codec_set_param( const pj_str_t *codec_id,
 pj_status_t pjsua_media_apply_xml_control(pjsua_call_id call_id,
 					  const pj_str_t *xml_st)
 {
+#if PJMEDIA_HAS_VIDEO
     pjsua_call *call = &pjsua_var.calls[call_id];
     const pj_str_t PICT_FAST_UPDATE = {"picture_fast_update", 19};
 
-#if PJMEDIA_HAS_VIDEO
     if (pj_strstr(xml_st, &PICT_FAST_UPDATE)) {
 	unsigned i;
 
@@ -2676,6 +2676,7 @@ pj_status_t pjsua_media_apply_xml_control(pjsua_call_id call_id,
 #endif
 
     /* Just to avoid compiler warning of unused var */
+    PJ_UNUSED_ARG(call_id);
     PJ_UNUSED_ARG(xml_st);
 
     return PJ_ENOTSUP;