Author: anthm Date: Sun Dec 17 19:48:34 2006 New Revision: 3690 Modified: freeswitch/trunk/configure freeswitch/trunk/configure.in freeswitch/trunk/src/include/switch_am_config.h.in freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak freeswitch/trunk/src/switch_channel.c Log: build changed Modified: freeswitch/trunk/configure ============================================================================== --- freeswitch/trunk/configure (original) +++ freeswitch/trunk/configure Sun Dec 17 19:48:34 2006 @@ -20678,7 +20678,7 @@ cat >>confdefs.h <<_ACEOF -#define __FUNCTION__ $FUNC_DEF +#define __AUTO_FUNCTION__ $FUNC_DEF _ACEOF Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sun Dec 17 19:48:34 2006 @@ -103,7 +103,7 @@ AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN) -AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)]) +AC_DEFINE_UNQUOTED([__AUTO_FUNCTION__],[$FUNC_DEF],[define it the right way ;)]) AC_DEFINE_UNQUOTED([inline],[$IN_LINE],[sunpro is bad at inline]) AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline]) Modified: freeswitch/trunk/src/include/switch_am_config.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_am_config.h.in (original) +++ freeswitch/trunk/src/include/switch_am_config.h.in Sun Dec 17 19:48:34 2006 @@ -113,7 +113,7 @@ #undef VERSION /* define it the right way ;) */ -#undef __FUNCTION__ +#undef __AUTO_FUNCTION__ /* sunpro is bad at inline */ #undef __inline__ Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Sun Dec 17 19:48:34 2006 @@ -77,7 +77,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line, switch_channel_state_t state); @@ -87,7 +87,7 @@ \param state new state \return current state of channel after application of new state */ -#define switch_channel_set_state(channel, state) switch_channel_perform_set_state(channel, __FILE__, (char *)__FUNCTION__, __LINE__, state) +#define switch_channel_set_state(channel, state) switch_channel_perform_set_state(channel, __FILE__, __FUNCTION__, __LINE__, state) /*! \brief return a cause code for a given string @@ -272,12 +272,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line); SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line); /*! @@ -285,37 +285,37 @@ \param channel channel to answer \return SWITCH_STATUS_SUCCESS if channel was answered successfully */ -#define switch_channel_answer(channel) switch_channel_perform_answer(channel, __FILE__, (char *) __FUNCTION__, __LINE__) +#define switch_channel_answer(channel) switch_channel_perform_answer(channel, __FILE__, __FUNCTION__, __LINE__) /*! \brief Mark a channel answered with no indication (for outbound calls) \param channel channel to mark answered \return SWITCH_STATUS_SUCCESS if channel was answered successfully */ -#define switch_channel_mark_answered(channel) switch_channel_perform_mark_answered(channel, __FILE__, (char *) __FUNCTION__, __LINE__) +#define switch_channel_mark_answered(channel) switch_channel_perform_mark_answered(channel, __FILE__, __FUNCTION__, __LINE__) SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line); /*! \brief Send Ringing message to a channel \param channel channel to ring \return SWITCH_STATUS_SUCCESS if successful */ -#define switch_channel_ringback(channel) switch_channel_perform_ringback(channel, __FILE__, (char *) __FUNCTION__, __LINE__) +#define switch_channel_ringback(channel) switch_channel_perform_ringback(channel, __FILE__, __FUNCTION__, __LINE__) SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line); /*! \brief Indicate progress on a channel to attempt early media \param channel channel to pre-answer \return SWITCH_STATUS_SUCCESS */ -#define switch_channel_pre_answer(channel) switch_channel_perform_pre_answer(channel, __FILE__, (char *) __FUNCTION__, __LINE__) +#define switch_channel_pre_answer(channel) switch_channel_perform_pre_answer(channel, __FILE__, __FUNCTION__, __LINE__) /*! \brief add a state handler table to a given channel @@ -375,7 +375,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line, switch_call_cause_t hangup_cause); @@ -385,7 +385,7 @@ \param hangup_cause the appropriate hangup cause \return the resulting channel state. */ -#define switch_channel_hangup(channel, hangup_cause) switch_channel_perform_hangup(channel, __FILE__, (char *)__FUNCTION__, __LINE__, hangup_cause) +#define switch_channel_hangup(channel, hangup_cause) switch_channel_perform_hangup(channel, __FILE__, __FUNCTION__, __LINE__, hangup_cause) /*! \brief Test for presence of DTMF on a given channel Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sun Dec 17 19:48:34 2006 @@ -639,7 +639,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_core_session_t *session, const char *file, - char *func, + const char *func, int line, switch_signal_t sig); /*! @@ -648,7 +648,7 @@ \param sig signal to send \return status returned by the session's signal handler */ -#define switch_core_session_kill_channel(session, sig) switch_core_session_perform_kill_channel(session, __FILE__, (char*)__FUNCTION__, __LINE__, sig) +#define switch_core_session_kill_channel(session, sig) switch_core_session_perform_kill_channel(session, __FILE__, __FUNCTION__, __LINE__, sig) /*! \brief Wait for a session to be ready for input Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Sun Dec 17 19:48:34 2006 @@ -41,6 +41,9 @@ #endif #include <stdio.h> +#ifndef __FUNCTION__ +#define __FUNCTION__ (const char *)__AUTO_FUNCTION__ +#endif #ifdef _MSC_VER Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Sun Dec 17 19:48:34 2006 @@ -262,13 +262,14 @@ &g729_10ms_8k_implementation }; -static const switch_codec_interface_t g729_codec_interface = { - /*.interface_name */ "g729", - /*.implementations */ &g729_8k_implementation, +static const switch_codec_interface_t g729_codec_interface = { + /*.interface_name */ "g729", + /*.implementations */ &g729_8k_implementation, + /*.next */ NULL }; static switch_loadable_module_interface_t g729_module_interface = { - /*.module_name */ modname, + /*.module_name */ "g729", /*.endpoint_interface */ NULL, /*.timer_interface */ NULL, /*.dialplan_interface */ NULL, Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Sun Dec 17 19:48:34 2006 @@ -63,5 +63,5 @@ endif endif -CFLAGS += -I../mod_spidermonkey -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_$(VER).OBJ -LDFLAGS +=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -lteletone +CFLAGS += -I../mod_spidermonkey -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_$(VER).OBJ +LDFLAGS +=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Dec 17 19:48:34 2006 @@ -452,7 +452,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line, switch_channel_state_t state) { @@ -936,7 +936,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line, switch_call_cause_t hangup_cause) { @@ -976,7 +976,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line) { switch_core_session_message_t msg; @@ -1017,7 +1017,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line) { switch_core_session_message_t msg; @@ -1051,7 +1051,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line) { switch_event_t *event; @@ -1086,7 +1086,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *channel, const char *file, - char *func, + const char *func, int line) { assert(channel != NULL);