autodroolz

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3707 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/configure b/configure
index e9f894edf76d6ca5d562f07cac3e4c83194037a7..0caedbdd12eb81ead0d0510333d90794a5068472 100755 (executable)
--- a/configure
+++ b/configure
@@ -20621,12 +20621,10 @@ case "$host" in
                         if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then                                SOLINK="-Bdynamic -dy -G"
                                 new_AM_CFLAGS="-DPATH_MAX=2048 -KPIC -DPIC"
                                 new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
-                                FUNC_DEF=__func__
                                 IN_LINE=""
                         elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then                                SOLINK="-Bdynamic -dy -G"
                                 new_AM_CFLAGS="-DPATH_MAX=2048 -fPIC"
                                 new_AM_LDFLAGS=""
-                                FUNC_DEF=__FUNCTION__
                                 IN_LINE=inline
                         fi
                         DYNAMIC_LIB_EXTEN="so"
@@ -20639,19 +20637,16 @@ case "$host" in
                         fi
                         DYNAMIC_LIB_EXTEN="dylib"
                         IN_LINE=inline
-                        FUNC_DEF=__FUNCTION__
                 ;;
                 x86_64-*-linux-gnu)
                         if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
                                 SOLINK="-Bdynamic -dy -G"
                                 new_AM_CFLAGS="-KPIC -DPIC"
                                 new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
-                                FUNC_DEF=__func__
                         elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
                                 SOLINK="-shared -Xlinker -x"
                                 new_AM_CFLAGS="-fPIC"
                                 new_AM_LDFLAGS=""
-                                FUNC_DEF=__FUNCTION__
                         fi
                         DYNAMIC_LIB_EXTEN="so"
                         IN_LINE=inline
@@ -20661,12 +20656,10 @@ case "$host" in
                                 SOLINK="-Bdynamic -dy -G"
                                 new_AM_CFLAGS="-KPIC -DPIC"
                                 new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
-                                FUNC_DEF=__func__
                         elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
                                 SOLINK="-shared -Xlinker -x"
                                 new_AM_CFLAGS="-fpic"
                                 new_AM_LDFLAGS=""
-                                FUNC_DEF=__FUNCTION__
                         fi
                         IN_LINE=inline
                         DYNAMIC_LIB_EXTEN="so"
@@ -20677,11 +20670,6 @@ esac
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define __AUTO_FUNCTION__ $FUNC_DEF
-_ACEOF
-
-
 cat >>confdefs.h <<_ACEOF
 #define inline $IN_LINE
 _ACEOF

diff --git a/configure.in b/configure.in
index f69ab7755db9b083b2f76da972ca1184d364c717..66f8a4812e5c5ec043032da4fe5b7d5d405713cc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -48,12 +48,10 @@ case "$host" in
                         if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then                                SOLINK="-Bdynamic -dy -G"
                                 new_AM_CFLAGS="-DPATH_MAX=2048 -KPIC -DPIC"
                                 new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
-                                FUNC_DEF=__func__
                                 IN_LINE=""
                         elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then                                SOLINK="-Bdynamic -dy -G"
                                 new_AM_CFLAGS="-DPATH_MAX=2048 -fPIC"
                                 new_AM_LDFLAGS=""
-                                FUNC_DEF=__FUNCTION__
                                 IN_LINE=inline
                         fi
                         DYNAMIC_LIB_EXTEN="so"
@@ -66,19 +64,16 @@ case "$host" in
                         fi
                         DYNAMIC_LIB_EXTEN="dylib"
                         IN_LINE=inline
-                        FUNC_DEF=__FUNCTION__
                 ;;
                 x86_64-*-linux-gnu)
                         if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
                                 SOLINK="-Bdynamic -dy -G"
                                 new_AM_CFLAGS="-KPIC -DPIC"
                                 new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
-                                FUNC_DEF=__func__
                         elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
                                 SOLINK="-shared -Xlinker -x"
                                 new_AM_CFLAGS="-fPIC"
                                 new_AM_LDFLAGS=""
-                                FUNC_DEF=__FUNCTION__
                         fi
                         DYNAMIC_LIB_EXTEN="so"
                         IN_LINE=inline
@@ -88,12 +83,10 @@ case "$host" in
                                 SOLINK="-Bdynamic -dy -G"
                                 new_AM_CFLAGS="-KPIC -DPIC"
                                 new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
-                                FUNC_DEF=__func__
                         elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
                                 SOLINK="-shared -Xlinker -x"
                                 new_AM_CFLAGS="-fpic"
                                 new_AM_LDFLAGS=""
-                                FUNC_DEF=__FUNCTION__
                         fi
                         IN_LINE=inline
                         DYNAMIC_LIB_EXTEN="so"
@@ -103,7 +96,6 @@ AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
 AC_SUBST(SOLINK)
 AC_SUBST(DYNAMIC_LIB_EXTEN)
-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])
 

diff --git a/src/include/switch_am_config.h.in b/src/include/switch_am_config.h.in
index dacaa97b3844f9afbd7e6aaf5d60133290776e26..d7a15df2c8ec7b6f8404bc95ea95faeb9e62c812 100644 (file)
--- a/src/include/switch_am_config.h.in
+++ b/src/include/switch_am_config.h.in
@@ -112,9 +112,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* define it the right way ;) */
-#undef __AUTO_FUNCTION__
-
 /* sunpro is bad at inline */
 #undef __inline__
 

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 5f4b37ed59c1667fe6ab63cafc30081cf787accb..fbbbff5b0a85d99c5e395d03b9c4f7034bd63077 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -87,7 +87,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
   \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__, __FUNCTION__, __LINE__, state)
+#define switch_channel_set_state(channel, state) switch_channel_perform_set_state(channel, __FILE__, __SWITCH_FUNC__, __LINE__, state)
 
 /*!
   \brief return a cause code for a given string
@@ -285,14 +285,14 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_chan
   \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__, __FUNCTION__, __LINE__)
+#define switch_channel_answer(channel) switch_channel_perform_answer(channel, __FILE__, __SWITCH_FUNC__, __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__, __FUNCTION__, __LINE__)
+#define switch_channel_mark_answered(channel) switch_channel_perform_mark_answered(channel, __FILE__, __SWITCH_FUNC__, __LINE__)
 
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t *channel,
                                                                                                                                const char *file,
@@ -303,7 +303,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t
   \param channel channel to ring
   \return SWITCH_STATUS_SUCCESS if successful
 */
-#define switch_channel_ringback(channel) switch_channel_perform_ringback(channel, __FILE__, __FUNCTION__, __LINE__)
+#define switch_channel_ringback(channel) switch_channel_perform_ringback(channel, __FILE__, __SWITCH_FUNC__, __LINE__)
 
 
 SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel,
@@ -315,7 +315,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel
   \param channel channel to pre-answer
   \return SWITCH_STATUS_SUCCESS
 */                                                             
-#define switch_channel_pre_answer(channel) switch_channel_perform_pre_answer(channel, __FILE__, __FUNCTION__, __LINE__)
+#define switch_channel_pre_answer(channel) switch_channel_perform_pre_answer(channel, __FILE__, __SWITCH_FUNC__, __LINE__)
 
 /*!
   \brief add a state handler table to a given channel
@@ -385,7 +385,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
   \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__, __FUNCTION__, __LINE__, hangup_cause)
+#define switch_channel_hangup(channel, hangup_cause) switch_channel_perform_hangup(channel, __FILE__, __SWITCH_FUNC__, __LINE__, hangup_cause)
 
 /*!
   \brief Test for presence of DTMF on a given channel

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index ef813ce1076c54830b0932163c78aa8b309769b6..0c186a9196c9a20101abb6078320a5afc741f4f5 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -648,7 +648,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_
   \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__, __FUNCTION__, __LINE__, sig)
+#define switch_core_session_kill_channel(session, sig) switch_core_session_perform_kill_channel(session, __FILE__, __SWITCH_FUNC__, __LINE__, sig)
 
 /*! 
   \brief Wait for a session to be ready for input

diff --git a/src/include/switch_event.h b/src/include/switch_event.h
index 7ea33d2249c992a4f8bd7258d3fafb65358eed5c..044e39239104e726db4555a0510ebd97bc7fadfc 100644 (file)
--- a/src/include/switch_event.h
+++ b/src/include/switch_event.h
@@ -298,7 +298,7 @@ SWITCH_DECLARE(void) switch_event_deliver(switch_event_t **event);
   \return SWITCH_STATUS_SUCCESS if the operation was successful
   \note the body supplied by this function will supersede an existing body the event may have
 */
-#define switch_event_fire(event) switch_event_fire_detailed(__FILE__, (char * )__FUNCTION__, __LINE__, event, NULL)
+#define switch_event_fire(event) switch_event_fire_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, event, NULL)
 
 /*!
   \brief Fire an event filling in most of the arguements with obvious values and allowing user_data to be sent
@@ -307,7 +307,7 @@ SWITCH_DECLARE(void) switch_event_deliver(switch_event_t **event);
   \return SWITCH_STATUS_SUCCESS if the operation was successful
   \note the body supplied by this function will supersede an existing body the event may have
 */
-#define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__FUNCTION__, __LINE__, event, data)
+#define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, event, data)
 ///\}
 
 SWITCH_END_EXTERN_C

diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index 8a8014381ca931d849a2362d80e5238fee3b655d..7055130cee3e86e2fe5c8cb4fd9729b4eaaa89ea 100644 (file)
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -41,8 +41,12 @@ SWITCH_BEGIN_EXTERN_C
 #endif
 
 #include <stdio.h>
-#ifndef __FUNCTION__
-#define __FUNCTION__ (const char *)__AUTO_FUNCTION__
+
+/* OMG */
+#ifdef WIN32
+#define __SWITCH_FUNC__ __FUNCTION__
+#else
+#define __SWITCH_FUNC__ (const char *)__func__
 #endif
 
 #ifdef _MSC_VER

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index ea1f1c42f7790f0a21fbd9aea43f3e85b68da598..f04026f8325486948827f7f2864fe8ddf8f963ab 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -393,9 +393,9 @@ typedef enum {
 } switch_core_session_message_flag_t;
 
 #define SWITCH_UUID_FORMATTED_LENGTH APR_UUID_FORMATTED_LENGTH         
-#define SWITCH_CHANNEL_LOG SWITCH_CHANNEL_ID_LOG, __FILE__, __FUNCTION__, __LINE__
-#define SWITCH_CHANNEL_LOG_CLEAN SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, __FUNCTION__, __LINE__
-#define SWITCH_CHANNEL_EVENT SWITCH_CHANNEL_ID_EVENT, __FILE__, __FUNCTION__, __LINE__
+#define SWITCH_CHANNEL_LOG SWITCH_CHANNEL_ID_LOG, __FILE__, __SWITCH_FUNC__, __LINE__
+#define SWITCH_CHANNEL_LOG_CLEAN SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, __SWITCH_FUNC__, __LINE__
+#define SWITCH_CHANNEL_EVENT SWITCH_CHANNEL_ID_EVENT, __FILE__, __SWITCH_FUNC__, __LINE__
 
 /*!
   \enum switch_channel_state_t