ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 13:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

build progress break everything

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3682 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2006-12-17 01:01:09 +00:00
parent 6bc48b7070
commit 44cc7d5cfe
28 changed files with 4565 additions and 4757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/switch.h
+1 -4
View File
@@ -43,14 +43,11 @@
#define SWITCH_END_EXTERN_C
#endif
//Need to include this before any other includes (MSVC Bug)
#include <switch_platform.h>
#ifndef WIN32
#include <switch_am_config.h>
#endif
#include <switch_platform.h>
#include <assert.h>
#include <setjmp.h>
#include <switch_apr.h>
src/include/switch_am_config.h.in
+3 -9
View File
@@ -100,6 +100,9 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Little Endian */
#undef SWITCH_BYTE_ORDER
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
@@ -109,18 +112,9 @@
/* Version number of package */
#undef VERSION
/* for the places where it is not defined */
#undef __BIG_ENDIAN
/* Little Endian */
#undef __BYTE_ORDER
/* define it the right way ;) */
#undef __FUNCTION__
/* for the places where it is not defined */
#undef __LITTLE_ENDIAN
/* sunpro is bad at inline */
#undef __inline__
src/include/switch_channel.h
+24 -24
View File
@@ -76,10 +76,10 @@ SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel);
SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel,
const char *file,
const char *func,
int line,
switch_channel_state_t state);
const char *file,
char *func,
int line,
switch_channel_state_t state);
/*!
\brief Set the current state of a channel
@@ -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__, (char *)__FUNCTION__, __LINE__, state)
/*!
\brief return a cause code for a given string
@@ -271,51 +271,51 @@ SWITCH_DECLARE(void) switch_channel_set_state_flag(switch_channel_t *channel, sw
SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch_channel_flag_t flags);
SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *channel,
const char *file,
const char *func,
int line);
const char *file,
char *func,
int line);
SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_channel_t *channel,
const char *file,
const char *func,
int line);
const char *file,
char *func,
int line);
/*!
\brief Answer a channel (initiate/acknowledge a successful connection)
\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__, (char *) __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__, __FUNCTION__, __LINE__)
#define switch_channel_mark_answered(channel) switch_channel_perform_mark_answered(channel, __FILE__, (char *) __FUNCTION__, __LINE__)
SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t *channel,
const char *file,
const char *func,
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__, __FUNCTION__, __LINE__)
#define switch_channel_ringback(channel) switch_channel_perform_ringback(channel, __FILE__, (char *) __FUNCTION__, __LINE__)
SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel,
const char *file,
const char *func,
int line);
const char *file,
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__, __FUNCTION__, __LINE__)
#define switch_channel_pre_answer(channel) switch_channel_perform_pre_answer(channel, __FILE__, (char *) __FUNCTION__, __LINE__)
/*!
\brief add a state handler table to a given channel
@@ -374,10 +374,10 @@ SWITCH_DECLARE(char *) switch_channel_get_name(switch_channel_t *channel);
SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_channel_t *channel,
const char *file,
const char *func,
int line,
switch_call_cause_t hangup_cause);
const char *file,
char *func,
int line,
switch_call_cause_t hangup_cause);
/*!
\brief Hangup a channel flagging it's state machine to end
@@ -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__, (char *)__FUNCTION__, __LINE__, hangup_cause)
/*!
\brief Test for presence of DTMF on a given channel
src/include/switch_core.h
+6 -5
View File
@@ -96,6 +96,7 @@ struct switch_core_thread_session {
/*! array of void pointers to pass mutiple data objects */
void *objs[SWITCH_MAX_CORE_THREAD_SESSION_OBJS];
/*! a pointer to a memory pool if the thread has it's own pool */
switch_input_callback_function_t input_callback;
switch_memory_pool_t *pool;
};
@@ -637,17 +638,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_core_session_t *session,
const char *file,
const char *func,
int line,
switch_signal_t sig);
const char *file,
char *func,
int line,
switch_signal_t sig);
/*!
\brief Send a signal to a channel
\param session session to send signal to
\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__, (char*)__FUNCTION__, __LINE__, sig)
/*!
\brief Wait for a session to be ready for input
src/include/switch_ivr.h
+1 -1
View File
@@ -43,7 +43,7 @@
SWITCH_BEGIN_EXTERN_C
static const switch_state_handler_table_t noop_state_handler = {0};
/**
* @defgroup switch_ivr IVR Library
src/include/switch_log.h
+1 -1
View File
@@ -94,7 +94,7 @@ SWITCH_DECLARE(switch_status_t) switch_log_shutdown(void);
\param ... variable args
\note there are channel macros to supply the first 4 parameters
*/
SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...);
SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, char *file, char *func, int line, switch_log_level_t level, char *fmt, ...);
/*!
\brief Shut down the logging engine
src/include/switch_platform.h
+13 -10
View File
@@ -60,16 +60,6 @@ SWITCH_BEGIN_EXTERN_C
*/
#pragma warning(disable:4152 4054 4100 4142 4200 4204 4706 4055 4214 4819 4132 4510 4512 4610)
#ifndef __LITTLE_ENDIAN
#define __LITTLE_ENDIAN 1234
#endif
#ifndef __BIG_ENDIAN
#define __BIG_ENDIAN 4321
#endif
#ifndef __BYTE_ORDER
#define __BYTE_ORDER __LITTLE_ENDIAN
#endif
#if (_MSC_VER >= 1400) // VC8+
#ifndef _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE
@@ -115,6 +105,19 @@ typedef unsigned long in_addr_t;
#include <time.h>
#endif // _MSC_VER
#ifndef __LITTLE_ENDIAN
#define __LITTLE_ENDIAN 1234
#endif
#ifndef __BIG_ENDIAN
#define __BIG_ENDIAN 4321
#endif
#ifndef __BYTE_ORDER
#ifdef SWITCH_BYTE_ORDER
#define __BYTE_ORDER SWITCH_BYTE_ORDER
#else
#define __BYTE_ORDER __LITTLE_ENDIAN
#endif
#endif
#ifdef WIN32
#if defined(SWITCH_CORE_DECLARE_STATIC)
src/include/switch_types.h
+3 -3
View File
@@ -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__, (char *) __FUNCTION__, __LINE__
#define SWITCH_CHANNEL_LOG_CLEAN SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, (char *)__FUNCTION__, __LINE__
#define SWITCH_CHANNEL_EVENT SWITCH_CHANNEL_ID_EVENT, __FILE__, (char *)__FUNCTION__, __LINE__
/*!
\enum switch_channel_state_t