October 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2918 - freeswitch/trunk/libs/iax/src
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: mikej Date: Sun Oct 1 17:55:52 2006 New Revision: 2918 Modified: freeswitch/trunk/libs/iax/src/iax-client.h Log: iax tweak for netbsd Modified: freeswitch/trunk/libs/iax/src/iax-client.h ============================================================================== --- freeswitch/trunk/libs/iax/src/iax-client.h (original) +++ freeswitch/trunk/libs/iax/src/iax-client.h Sun Oct 1 17:55:52 2006 @@ -23,7 +23,7 @@ #pragma warning(disable:4200) #endif -#ifndef LINUX +#if !defined(LINUX) && !defined(NETBSD) #define socklen_t int #endif

1 0

[commit] r2917 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: mikej Date: Sun Oct 1 17:44:49 2006 New Revision: 2917 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: type tweak Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sun Oct 1 17:44:49 2006 @@ -464,7 +464,7 @@ if (resource) { for (x = 0; x < strlen(resource); x++) { - resource[x] = tolower(resource[x]); + resource[x] = (char)tolower((int)resource[x]); } }

1 0

[commit] r2916 - freeswitch/trunk/src
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: mikej Date: Sun Oct 1 17:29:03 2006 New Revision: 2916 Modified: freeswitch/trunk/src/switch_xml.c Log: type tweak Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Sun Oct 1 17:29:03 2006 @@ -118,7 +118,7 @@ if (str) { for(x = 0; x < strlen(str); x++) { - buf[x] = (char)tolower(str[x]); + buf[x] = (char)tolower((int)str[x]); } for(x = 0;;x++) { if (!SECTIONS[x].name) { @@ -296,7 +296,7 @@ } for (s = r; ; ) { - while (*s && *s != '&' && (*s != '%' || t != '%') && !isspace(*s)) s++; + while (*s && *s != '&' && (*s != '%' || t != '%') && !isspace((int)(*s))) s++; if (! *s) break; else if (t != 'c' && ! strncmp(s, "&#", 2)) { // character reference @@ -331,7 +331,7 @@ } else s++; // not a known entity } - else if ((t == ' ' || t == '*') && isspace(*s)) *(s++) = ' '; + else if ((t == ' ' || t == '*') && isspace((int)(*s))) *(s++) = ' '; else s++; // no decoding needed } @@ -616,12 +616,12 @@ attr = (char **)SWITCH_XML_NIL; d = ++s; - if (isalpha(*s) || *s == '_' || *s == ':' || (int8_t) *s < '\0') { // new tag + if (isalpha((int)(*s)) || *s == '_' || *s == ':' || (int8_t) *s < '\0') { // new tag if (! root->cur) return switch_xml_err(root, d, "markup outside of root element"); s += strcspn(s, SWITCH_XML_WS "/>"); - while (isspace(*s)) *(s++) = '\0'; // null terminate tag name + while (isspace((int)(*s))) *(s++) = '\0'; // null terminate tag name if (*s && *s != '/' && *s != '>') // find tag in default attr list for (i = 0; (a = root->attr[i]) && strcmp(a[0], d); i++); @@ -637,7 +637,7 @@ attr[l] = s; // set attribute name s += strcspn(s, SWITCH_XML_WS "=/>"); - if (*s == '=' || isspace(*s)) { + if (*s == '=' || isspace((int)(*s))) { *(s++) = '\0'; // null terminate tag attribute name q = *(s += strspn(s, SWITCH_XML_WS "=")); if (q == '"' || q == '\'') { // attribute value @@ -656,7 +656,7 @@ attr[l + 3][l / 2] = SWITCH_XML_TXTM; // value malloced } } - while (isspace(*s)) s++; + while (isspace((int)(*s))) s++; } if (*s == '/') { // self closing tag @@ -683,7 +683,7 @@ if (! (q = *s) && e != '>') return switch_xml_err(root, d, "missing >"); *s = '\0'; // temporarily null terminate tag name if (switch_xml_close_tag(root, d, s)) return &root->xml; - if (isspace(*s = q)) s += strspn(s, SWITCH_XML_WS); + if (isspace((int)(*s = q))) s += strspn(s, SWITCH_XML_WS); } else if (! strncmp(s, "!--", 3)) { // comment if (! (s = strstr(s + 3, "--")) || (*(s += 2) != '>' && *s) ||

1 0

[commit] r2915 - freeswitch/trunk/src
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: mikej Date: Sun Oct 1 17:21:41 2006 New Revision: 2915 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: type tweak Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sun Oct 1 17:21:41 2006 @@ -586,11 +586,11 @@ if (!(codec = switch_core_hash_find(loadable_modules.codec_hash, name))) { for(x = 0; x < strlen(name); x++) { - altname[x] = (char)toupper(name[x]); + altname[x] = (char)toupper((int)name[x]); } if (!(codec = switch_core_hash_find(loadable_modules.codec_hash, altname))) { for(x = 0; x < strlen(name); x++) { - altname[x] = (char)tolower(name[x]); + altname[x] = (char)tolower((int)name[x]); } codec = switch_core_hash_find(loadable_modules.codec_hash, altname); }

1 0

[commit] r2914 - freeswitch/trunk/libs
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: anthm Date: Sun Oct 1 12:26:20 2006 New Revision: 2914 Modified: freeswitch/trunk/libs/mozilla.build.sh Log: fix spidermonkey freebsd build take 2, try this Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Sun Oct 1 12:26:20 2006 @@ -1,5 +1,7 @@ hosttype=`uname -s` +pthreadopts="" + if [ $hosttype = "FreeBSD" ] ; then patch <<__EOF__ @@ -20,8 +22,8 @@ __EOF__ cp js/src/config/Linux_All.mk js/src/config/`uname -s``uname -r`.mk -ldflags=-lpthread +pthreadopts=" --with-pthreads=yes" fi arch=`uname -m` @@ -31,7 +33,7 @@ opts="--enable-64bit" fi -cd nsprpub && LDFLAGS=$ldflags ./configure $opts && $MAKE +cd nsprpub && ./configure $opts $pthreadopts && $MAKE cd ../js/src && JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a`

1 0

[commit] r2913 - freeswitch/trunk/libs
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: anthm Date: Sun Oct 1 12:06:16 2006 New Revision: 2913 Modified: freeswitch/trunk/libs/mozilla.build.sh Log: fix spidermonkey freebsd build. Thanks vile for the patch Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Sun Oct 1 12:06:16 2006 @@ -1,3 +1,29 @@ +hosttype=`uname -s` + +if [ $hosttype = "FreeBSD" ] ; then + +patch <<__EOF__ +--- nsprpub/pr/include/md/_freebsd.h.orig Sat Sep 30 22:19:12 2006 ++++ nsprpub/pr/include/md/_freebsd.h Sat Sep 30 22:23:16 2006 +@@ -106,6 +106,11 @@ + #define _PR_IPV6_V6ONLY_PROBE + #endif + ++#if __FreeBSD_version >= 601103 ++#define _PR_HAVE_GETPROTO_R ++#define _PR_HAVE_5_ARG_GETPROTO_R ++#endif ++ + #define USE_SETJMP + + #ifndef _PR_PTHREADS +__EOF__ + +cp js/src/config/Linux_All.mk js/src/config/`uname -s``uname -r`.mk +ldflags=-lpthread + +fi + arch=`uname -m` opts="" @@ -5,7 +31,7 @@ opts="--enable-64bit" fi -cd nsprpub && ./configure $opts && $MAKE +cd nsprpub && LDFLAGS=$ldflags ./configure $opts && $MAKE cd ../js/src && JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a`

1 0

[commit] r2912 - freeswitch/trunk/src/mod/formats/mod_sndfile
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: mikej Date: Sun Oct 1 00:32:52 2006 New Revision: 2912 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile Log: don;t think we need sqlite support in sndfile, and it was causing build issues on some freebsd boxes for some reason. Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile Sun Oct 1 00:32:52 2006 @@ -3,7 +3,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.16.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.16.tar.gz --prefix=$(PREFIX) --disable-sqlite $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o

1 0

[commit] r2911 - freeswitch/trunk/w32/Setup
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: mikej Date: Sun Oct 1 00:26:52 2006 New Revision: 2911 Modified: freeswitch/trunk/w32/Setup/Setup.vdproj Log: add sofia to setup Modified: freeswitch/trunk/w32/Setup/Setup.vdproj ============================================================================== --- freeswitch/trunk/w32/Setup/Setup.vdproj (original) +++ freeswitch/trunk/w32/Setup/Setup.vdproj Sun Oct 1 00:26:52 2006 @@ -172,6 +172,12 @@ "Entry" { "MsmKey" = "8:_87C07635A76B4C5D85C78D91ED64A537" + "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_87C07635A76B4C5D85C78D91ED64A537" "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } @@ -433,6 +439,12 @@ "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -2620,6 +2632,34 @@ "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" "OutputProjectGuid" = "8:{FE3540C5-3303-46E0-A69E-D92F775687F1}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FBB0E565B1DE49CE9C827ACAC337AC5B" + { + "SourcePath" = "8:..\\..\\debug\\mod\\mod_sofia.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{0DF3ABD0-DDC0-4265-B778-07C66780979B}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" {

1 0

[commit] r2910 - freeswitch/trunk/libs
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: mikej Date: Sat Sep 30 23:54:50 2006 New Revision: 2910 Modified: freeswitch/trunk/libs/portaudio.build.sh Log: fix portaudio build on FreeBSD Modified: freeswitch/trunk/libs/portaudio.build.sh ============================================================================== --- freeswitch/trunk/libs/portaudio.build.sh (original) +++ freeswitch/trunk/libs/portaudio.build.sh Sat Sep 30 23:54:50 2006 @@ -10,6 +10,29 @@ ;; mingw* ) + +--- pa_unix_oss/pa_unix_oss.c.orig Sat Sep 30 20:46:55 2006 ++++ pa_unix_oss/pa_unix_oss.c Sat Sep 30 20:46:13 2006 +@@ -95,7 +95,9 @@ + + #include <stdio.h> + #include <stdlib.h> ++#ifndef __FreeBSD__ + #include <malloc.h> ++#endif + #include <memory.h> + #include <math.h> + #include <sys/ioctl.h> +@@ -109,6 +111,8 @@ + + #ifdef __linux__ + #include <linux/soundcard.h> ++#elif defined(__FreeBSD__) ++#include <sys/soundcard.h> + #else + #include <machine/soundcard.h> /* JH20010905 */ + #endif + __EOF__ arch=`uname -m`

1 0

[commit] r2909 - freeswitch/trunk/src/include
by Freeswitch SVN 01 Oct '06

01 Oct '06

Author: mikej Date: Sat Sep 30 21:36:44 2006 New Revision: 2909 Modified: freeswitch/trunk/src/include/switch.h Log: update docs Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Sat Sep 30 21:36:44 2006 @@ -84,7 +84,7 @@ * \section supports Supported Platforms * Freeswitch has been built on the following platforms: * - * - Linux (x86) + * - Linux (x86 & x86_64) * - Windows (MSVC 2005) * - Mac OS X (intel & ppc ) * - OpenBSD, FreeBSD 6

1 0