[Freeswitch-branches] [commit] r4882 - in freeswitch/branches/mikej/sofiasip-upgrade: . libs/libsndfile src src/include

[Freeswitch SVN]

Author: mikej
Date: Sat Apr  7 05:04:10 2007
New Revision: 4882

Modified:
   freeswitch/branches/mikej/sofiasip-upgrade/bootstrap.sh
   freeswitch/branches/mikej/sofiasip-upgrade/libs/libsndfile/Makefile.am
   freeswitch/branches/mikej/sofiasip-upgrade/src/include/switch.h
   freeswitch/branches/mikej/sofiasip-upgrade/src/switch_apr.c
   freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_bridge.c
   freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_play_say.c

Log:
solaris warnings

Modified: freeswitch/branches/mikej/sofiasip-upgrade/bootstrap.sh
==============================================================================
--- freeswitch/branches/mikej/sofiasip-upgrade/bootstrap.sh	(original)
+++ freeswitch/branches/mikej/sofiasip-upgrade/bootstrap.sh	Sat Apr  7 05:04:10 2007
@@ -68,9 +68,9 @@
 IFS=.; set $lt_version; IFS=' '
 lt_status="good"
 
-a=$[$1+0]
-b=$[$2+0]
-c=$[$3+0]
+if test -z "$1"; then a=0 ; else a=$1;fi
+if test -z "$2"; then b=0 ; else b=$2;fi
+if test -z "$3"; then c=0 ; else c=$3;fi 
 
 if test "$a" -lt "2"; then
    if test "$b" -lt "5" -o "$b" =  "5" -a "$c" -lt "14" ; then

Modified: freeswitch/branches/mikej/sofiasip-upgrade/libs/libsndfile/Makefile.am
==============================================================================
--- freeswitch/branches/mikej/sofiasip-upgrade/libs/libsndfile/Makefile.am	(original)
+++ freeswitch/branches/mikej/sofiasip-upgrade/libs/libsndfile/Makefile.am	Sat Apr  7 05:04:10 2007
@@ -1,10 +1,11 @@
-## Process this file with automake to produce Makefile.in
+# Process this file with automake to produce Makefile.in
 
-SUBDIRS = man doc Win32 Octave src examples regtest tests
+SUBDIRS = Win32 Octave src
+# man doc Win32 examples regtest tests
 DIST_SUBDIRS = $(SUBDIRS)
 EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \
 			sndfile.pc.in Mingw-make-dist.sh
-			
+
 			 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = sndfile.pc

Modified: freeswitch/branches/mikej/sofiasip-upgrade/src/include/switch.h
==============================================================================
--- freeswitch/branches/mikej/sofiasip-upgrade/src/include/switch.h	(original)
+++ freeswitch/branches/mikej/sofiasip-upgrade/src/include/switch.h	Sat Apr  7 05:04:10 2007
@@ -50,8 +50,7 @@
 #define FREESWITCH_PEN "27880"
 #define FREESWITCH_OID_PREFIX ".1.3.6.1.4.1." FREESWITCH_PEN
 #define FREESWITCH_ITAD "543"
-
-
+#define __EXTENSIONS__ 1
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -60,7 +59,7 @@
 #include <setjmp.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
 #include <limits.h>
 #include <sys/types.h>

Modified: freeswitch/branches/mikej/sofiasip-upgrade/src/switch_apr.c
==============================================================================
--- freeswitch/branches/mikej/sofiasip-upgrade/src/switch_apr.c	(original)
+++ freeswitch/branches/mikej/sofiasip-upgrade/src/switch_apr.c	Sat Apr  7 05:04:10 2007
@@ -381,7 +381,7 @@
 
 SWITCH_DECLARE(switch_status_t) switch_socket_shutdown(switch_socket_t * sock, switch_shutdown_how_e how)
 {
-	return apr_socket_shutdown(sock, how);
+	return apr_socket_shutdown(sock, (apr_shutdown_how_e)how);
 }
 
 SWITCH_DECLARE(switch_status_t) switch_socket_close(switch_socket_t * sock)

Modified: freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_bridge.c
==============================================================================
--- freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_bridge.c	(original)
+++ freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_bridge.c	Sat Apr  7 05:04:10 2007
@@ -31,7 +31,6 @@
 #include <switch.h>
 
 static const switch_state_handler_table_t audio_bridge_peer_state_handlers;
-static const switch_state_handler_table_t originate_state_handlers;
 
 /* Bridge Related Stuff*/
 /*********************************************************************************/

Modified: freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_play_say.c
==============================================================================
--- freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_play_say.c	(original)
+++ freeswitch/branches/mikej/sofiasip-upgrade/src/switch_ivr_play_say.c	Sat Apr  7 05:04:10 2007
@@ -77,7 +77,7 @@
 	return (switch_say_method_t) x;
 }
 
-static switch_say_method_t get_say_type_by_name(char *name)
+static switch_say_type_t get_say_type_by_name(char *name)
 {
 	int x = 0;
 	for (x = 0; SAY_TYPE_NAMES[x]; x++) {
@@ -86,7 +86,7 @@
 		}
 	}
 
-	return (switch_say_method_t) x;
+	return (switch_say_type_t) x;
 }