Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
81452c26
提交
81452c26
authored
12月 19, 2006
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
autodroolz
git-svn-id:
http://svn.freeswitch.org/svn/freeswitch/trunk@3707
d0543943-73ff-0310-b7d9-9358b9ac24b2
上级
8de67dfe
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
18 行增加
和
37 行删除
+18
-37
configure
configure
+0
-12
configure.in
configure.in
+0
-8
switch_am_config.h.in
src/include/switch_am_config.h.in
+0
-3
switch_channel.h
src/include/switch_channel.h
+6
-6
switch_core.h
src/include/switch_core.h
+1
-1
switch_event.h
src/include/switch_event.h
+2
-2
switch_platform.h
src/include/switch_platform.h
+6
-2
switch_types.h
src/include/switch_types.h
+3
-3
没有找到文件。
configure
浏览文件 @
81452c26
...
@@ -20621,12 +20621,10 @@ case "$host" in
...
@@ -20621,12 +20621,10 @@ case "$host" in
if
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xsun"
;
then
SOLINK
=
"-Bdynamic -dy -G"
if
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xsun"
;
then
SOLINK
=
"-Bdynamic -dy -G"
new_AM_CFLAGS
=
"-DPATH_MAX=2048 -KPIC -DPIC"
new_AM_CFLAGS
=
"-DPATH_MAX=2048 -KPIC -DPIC"
new_AM_LDFLAGS
=
"-L
${
prefix
}
/lib -R
${
prefix
}
/lib"
new_AM_LDFLAGS
=
"-L
${
prefix
}
/lib -R
${
prefix
}
/lib"
FUNC_DEF
=
__func__
IN_LINE
=
""
IN_LINE
=
""
elif
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xgnu"
;
then
SOLINK
=
"-Bdynamic -dy -G"
elif
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xgnu"
;
then
SOLINK
=
"-Bdynamic -dy -G"
new_AM_CFLAGS
=
"-DPATH_MAX=2048 -fPIC"
new_AM_CFLAGS
=
"-DPATH_MAX=2048 -fPIC"
new_AM_LDFLAGS
=
""
new_AM_LDFLAGS
=
""
FUNC_DEF
=
__FUNCTION__
IN_LINE
=
inline
IN_LINE
=
inline
fi
fi
DYNAMIC_LIB_EXTEN
=
"so"
DYNAMIC_LIB_EXTEN
=
"so"
...
@@ -20639,19 +20637,16 @@ case "$host" in
...
@@ -20639,19 +20637,16 @@ case "$host" in
fi
fi
DYNAMIC_LIB_EXTEN
=
"dylib"
DYNAMIC_LIB_EXTEN
=
"dylib"
IN_LINE
=
inline
IN_LINE
=
inline
FUNC_DEF
=
__FUNCTION__
;;
;;
x86_64-
*
-linux-gnu
)
x86_64-
*
-linux-gnu
)
if
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xsun"
;
then
if
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xsun"
;
then
SOLINK
=
"-Bdynamic -dy -G"
SOLINK
=
"-Bdynamic -dy -G"
new_AM_CFLAGS
=
"-KPIC -DPIC"
new_AM_CFLAGS
=
"-KPIC -DPIC"
new_AM_LDFLAGS
=
"-L
${
prefix
}
/lib -R
${
prefix
}
/lib"
new_AM_LDFLAGS
=
"-L
${
prefix
}
/lib -R
${
prefix
}
/lib"
FUNC_DEF
=
__func__
elif
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xgnu"
;
then
elif
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xgnu"
;
then
SOLINK
=
"-shared -Xlinker -x"
SOLINK
=
"-shared -Xlinker -x"
new_AM_CFLAGS
=
"-fPIC"
new_AM_CFLAGS
=
"-fPIC"
new_AM_LDFLAGS
=
""
new_AM_LDFLAGS
=
""
FUNC_DEF
=
__FUNCTION__
fi
fi
DYNAMIC_LIB_EXTEN
=
"so"
DYNAMIC_LIB_EXTEN
=
"so"
IN_LINE
=
inline
IN_LINE
=
inline
...
@@ -20661,12 +20656,10 @@ case "$host" in
...
@@ -20661,12 +20656,10 @@ case "$host" in
SOLINK
=
"-Bdynamic -dy -G"
SOLINK
=
"-Bdynamic -dy -G"
new_AM_CFLAGS
=
"-KPIC -DPIC"
new_AM_CFLAGS
=
"-KPIC -DPIC"
new_AM_LDFLAGS
=
"-L
${
prefix
}
/lib -R
${
prefix
}
/lib"
new_AM_LDFLAGS
=
"-L
${
prefix
}
/lib -R
${
prefix
}
/lib"
FUNC_DEF
=
__func__
elif
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xgnu"
;
then
elif
test
"x
${
ax_cv_c_compiler_vendor
}
"
=
"xgnu"
;
then
SOLINK
=
"-shared -Xlinker -x"
SOLINK
=
"-shared -Xlinker -x"
new_AM_CFLAGS
=
"-fpic"
new_AM_CFLAGS
=
"-fpic"
new_AM_LDFLAGS
=
""
new_AM_LDFLAGS
=
""
FUNC_DEF
=
__FUNCTION__
fi
fi
IN_LINE
=
inline
IN_LINE
=
inline
DYNAMIC_LIB_EXTEN
=
"so"
DYNAMIC_LIB_EXTEN
=
"so"
...
@@ -20677,11 +20670,6 @@ esac
...
@@ -20677,11 +20670,6 @@ esac
cat
>>
confdefs.h
<<
_ACEOF
#define __AUTO_FUNCTION__
$FUNC_DEF
_ACEOF
cat
>>
confdefs.h
<<
_ACEOF
cat
>>
confdefs.h
<<
_ACEOF
#define inline
$IN_LINE
#define inline
$IN_LINE
_ACEOF
_ACEOF
...
...
configure.in
浏览文件 @
81452c26
...
@@ -48,12 +48,10 @@ case "$host" in
...
@@ -48,12 +48,10 @@ case "$host" in
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G"
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-DPATH_MAX=2048 -KPIC -DPIC"
new_AM_CFLAGS="-DPATH_MAX=2048 -KPIC -DPIC"
new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
FUNC_DEF=__func__
IN_LINE=""
IN_LINE=""
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G"
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-DPATH_MAX=2048 -fPIC"
new_AM_CFLAGS="-DPATH_MAX=2048 -fPIC"
new_AM_LDFLAGS=""
new_AM_LDFLAGS=""
FUNC_DEF=__FUNCTION__
IN_LINE=inline
IN_LINE=inline
fi
fi
DYNAMIC_LIB_EXTEN="so"
DYNAMIC_LIB_EXTEN="so"
...
@@ -66,19 +64,16 @@ case "$host" in
...
@@ -66,19 +64,16 @@ case "$host" in
fi
fi
DYNAMIC_LIB_EXTEN="dylib"
DYNAMIC_LIB_EXTEN="dylib"
IN_LINE=inline
IN_LINE=inline
FUNC_DEF=__FUNCTION__
;;
;;
x86_64-*-linux-gnu)
x86_64-*-linux-gnu)
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
new_AM_CFLAGS="-KPIC -DPIC"
new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fPIC"
new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS=""
new_AM_LDFLAGS=""
FUNC_DEF=__FUNCTION__
fi
fi
DYNAMIC_LIB_EXTEN="so"
DYNAMIC_LIB_EXTEN="so"
IN_LINE=inline
IN_LINE=inline
...
@@ -88,12 +83,10 @@ case "$host" in
...
@@ -88,12 +83,10 @@ case "$host" in
SOLINK="-Bdynamic -dy -G"
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
new_AM_CFLAGS="-KPIC -DPIC"
new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fpic"
new_AM_CFLAGS="-fpic"
new_AM_LDFLAGS=""
new_AM_LDFLAGS=""
FUNC_DEF=__FUNCTION__
fi
fi
IN_LINE=inline
IN_LINE=inline
DYNAMIC_LIB_EXTEN="so"
DYNAMIC_LIB_EXTEN="so"
...
@@ -103,7 +96,6 @@ AC_SUBST(new_AM_CFLAGS)
...
@@ -103,7 +96,6 @@ AC_SUBST(new_AM_CFLAGS)
AC_SUBST(new_AM_LDFLAGS)
AC_SUBST(new_AM_LDFLAGS)
AC_SUBST(SOLINK)
AC_SUBST(SOLINK)
AC_SUBST(DYNAMIC_LIB_EXTEN)
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])
AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline])
AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline])
...
...
src/include/switch_am_config.h.in
浏览文件 @
81452c26
...
@@ -112,9 +112,6 @@
...
@@ -112,9 +112,6 @@
/* Version number of package */
/* Version number of package */
#undef VERSION
#undef VERSION
/* define it the right way ;) */
#undef __AUTO_FUNCTION__
/* sunpro is bad at inline */
/* sunpro is bad at inline */
#undef __inline__
#undef __inline__
...
...
src/include/switch_channel.h
浏览文件 @
81452c26
...
@@ -87,7 +87,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
...
@@ -87,7 +87,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
\param state new state
\param state new state
\return current state of channel after application of 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
\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
...
@@ -285,14 +285,14 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_chan
\param channel channel to answer
\param channel channel to answer
\return SWITCH_STATUS_SUCCESS if channel was answered successfully
\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)
\brief Mark a channel answered with no indication (for outbound calls)
\param channel channel to mark answered
\param channel channel to mark answered
\return SWITCH_STATUS_SUCCESS if channel was answered successfully
\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
,
SWITCH_DECLARE
(
switch_status_t
)
switch_channel_perform_ringback
(
switch_channel_t
*
channel
,
const
char
*
file
,
const
char
*
file
,
...
@@ -303,7 +303,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t
...
@@ -303,7 +303,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t
\param channel channel to ring
\param channel channel to ring
\return SWITCH_STATUS_SUCCESS if successful
\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
,
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
...
@@ -315,7 +315,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel
\param channel channel to pre-answer
\param channel channel to pre-answer
\return SWITCH_STATUS_SUCCESS
\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
\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
...
@@ -385,7 +385,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
\param hangup_cause the appropriate hangup cause
\param hangup_cause the appropriate hangup cause
\return the resulting channel state.
\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
\brief Test for presence of DTMF on a given channel
...
...
src/include/switch_core.h
浏览文件 @
81452c26
...
@@ -648,7 +648,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_
...
@@ -648,7 +648,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_
\param sig signal to send
\param sig signal to send
\return status returned by the session's signal handler
\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
\brief Wait for a session to be ready for input
...
...
src/include/switch_event.h
浏览文件 @
81452c26
...
@@ -298,7 +298,7 @@ SWITCH_DECLARE(void) switch_event_deliver(switch_event_t **event);
...
@@ -298,7 +298,7 @@ SWITCH_DECLARE(void) switch_event_deliver(switch_event_t **event);
\return SWITCH_STATUS_SUCCESS if the operation was successful
\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
\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
\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);
...
@@ -307,7 +307,7 @@ SWITCH_DECLARE(void) switch_event_deliver(switch_event_t **event);
\return SWITCH_STATUS_SUCCESS if the operation was successful
\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
\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
SWITCH_END_EXTERN_C
...
...
src/include/switch_platform.h
浏览文件 @
81452c26
...
@@ -41,8 +41,12 @@ SWITCH_BEGIN_EXTERN_C
...
@@ -41,8 +41,12 @@ SWITCH_BEGIN_EXTERN_C
#endif
#endif
#include <stdio.h>
#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
#endif
#ifdef _MSC_VER
#ifdef _MSC_VER
...
...
src/include/switch_types.h
浏览文件 @
81452c26
...
@@ -393,9 +393,9 @@ typedef enum {
...
@@ -393,9 +393,9 @@ typedef enum {
}
switch_core_session_message_flag_t
;
}
switch_core_session_message_flag_t
;
#define SWITCH_UUID_FORMATTED_LENGTH APR_UUID_FORMATTED_LENGTH
#define SWITCH_UUID_FORMATTED_LENGTH APR_UUID_FORMATTED_LENGTH
#define SWITCH_CHANNEL_LOG SWITCH_CHANNEL_ID_LOG, __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__, __
FUNCTION
__, __LINE__
#define SWITCH_CHANNEL_LOG_CLEAN SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, __
SWITCH_FUNC
__, __LINE__
#define SWITCH_CHANNEL_EVENT SWITCH_CHANNEL_ID_EVENT, __FILE__, __
FUNCTION
__, __LINE__
#define SWITCH_CHANNEL_EVENT SWITCH_CHANNEL_ID_EVENT, __FILE__, __
SWITCH_FUNC
__, __LINE__
/*!
/*!
\enum switch_channel_state_t
\enum switch_channel_state_t
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论