- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

01 Oct '06

Author: mikej Date: Sun Oct 1 18:50:31 2006 New Revision: 2922 Modified: freeswitch/trunk/libs/portaudio.build.sh Log: fix portaudio build on OpenBSD take 3 Modified: freeswitch/trunk/libs/portaudio.build.sh ============================================================================== --- freeswitch/trunk/libs/portaudio.build.sh (original) +++ freeswitch/trunk/libs/portaudio.build.sh Sun Oct 1 18:50:31 2006 @@ -27,12 +27,14 @@ #ifdef __linux__ #include <linux/soundcard.h> -+#elif defined(__FreeBSD__) || defined( __NetBSD__) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) +#include <sys/soundcard.h> -+#elif defined( __OpenBSD__) -+#include <soundcard.h> #else ++#if defined(__OpenBSD__) ++#include <soundcard.h> ++#else #include <machine/soundcard.h> /* JH20010905 */ ++#endif #endif __EOF__

1 0

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

01 Oct '06

Author: mikej Date: Sun Oct 1 18:39:50 2006 New Revision: 2921 Modified: freeswitch/trunk/libs/portaudio.build.sh Log: fix portaudio build on OpenBSD take 2 Modified: freeswitch/trunk/libs/portaudio.build.sh ============================================================================== --- freeswitch/trunk/libs/portaudio.build.sh (original) +++ freeswitch/trunk/libs/portaudio.build.sh Sun Oct 1 18:39:50 2006 @@ -27,8 +27,10 @@ #ifdef __linux__ #include <linux/soundcard.h> -+#elif defined(__FreeBSD__) || defined( __NetBSD__) || defined( __OpenBSD__) ++#elif defined(__FreeBSD__) || defined( __NetBSD__) +#include <sys/soundcard.h> ++#elif defined( __OpenBSD__) ++#include <soundcard.h> #else #include <machine/soundcard.h> /* JH20010905 */ #endif

1 0

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

01 Oct '06

Author: mikej Date: Sun Oct 1 18:36:44 2006 New Revision: 2920 Modified: freeswitch/trunk/libs/portaudio.build.sh Log: fix portaudio build on OpenBSD Modified: freeswitch/trunk/libs/portaudio.build.sh ============================================================================== --- freeswitch/trunk/libs/portaudio.build.sh (original) +++ freeswitch/trunk/libs/portaudio.build.sh Sun Oct 1 18:36:44 2006 @@ -27,7 +27,7 @@ #ifdef __linux__ #include <linux/soundcard.h> -+#elif defined(__FreeBSD__) || defined( __NetBSD__) ++#elif defined(__FreeBSD__) || defined( __NetBSD__) || defined( __OpenBSD__) +#include <sys/soundcard.h> #else #include <machine/soundcard.h> /* JH20010905 */

1 0

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

01 Oct '06

Author: mikej Date: Sun Oct 1 18:15:44 2006 New Revision: 2919 Modified: freeswitch/trunk/libs/portaudio.build.sh Log: header tweak for netbsd Modified: freeswitch/trunk/libs/portaudio.build.sh ============================================================================== --- freeswitch/trunk/libs/portaudio.build.sh (original) +++ freeswitch/trunk/libs/portaudio.build.sh Sun Oct 1 18:15:44 2006 @@ -27,7 +27,7 @@ #ifdef __linux__ #include <linux/soundcard.h> -+#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined( __NetBSD__) +#include <sys/soundcard.h> #else #include <machine/soundcard.h> /* JH20010905 */

1 0

[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