kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

fix evil pragmas in unix and get rid of horrible ^M in the files (dont do that)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@644 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-02-21 18:34:32 +00:00
parent 1635505808
commit 009e9607e7
3 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/switch_core.c
View File

@ -114,16 +114,17 @@ static void switch_core_standard_on_transmit(switch_core_session *session);
/* The main runtime obj we keep this hidden for ourselves */ /* The main runtime obj we keep this hidden for ourselves */
static struct switch_core_runtime runtime; static struct switch_core_runtime runtime;
#ifdef WIN32
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4100 ) #pragma warning( disable : 4100 )
#endif
static int handle_SIGPIPE(int sig) static int handle_SIGPIPE(int sig)
{ {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Sig Pipe!\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Sig Pipe!\n");
return 0; return 0;
} }
#pragma warning( pop ) #ifdef WIN32
#pragma warning( pop )
#ifdef TRAP_BUS #ifdef TRAP_BUS
static int handle_SIGBUS(int sig) static int handle_SIGBUS(int sig)
{ {
@ -131,17 +132,20 @@ static int handle_SIGBUS(int sig)
return 0; return 0;
} }
#endif #endif
#endif
/* no ctl-c mofo */ /* no ctl-c mofo */
#ifdef WIN32
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4100 ) #pragma warning( disable : 4100 )
#endif
static int handle_SIGINT(int sig) static int handle_SIGINT(int sig)
{ {
return 0; return 0;
} }
#pragma warning( pop ) #ifdef WIN32
#pragma warning( pop )
#endif
static void db_pick_path(char *dbname, char *buf, size_t size) static void db_pick_path(char *dbname, char *buf, size_t size)
{ {
@ -623,8 +627,10 @@ SWITCH_DECLARE(switch_status) switch_core_timer_destroy(switch_timer *timer)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
#pragma warning( push ) #ifdef WIN32
#pragma warning( disable : 4100 ) #pragma warning( push )
#pragma warning( disable : 4100 )
#endif
static void *switch_core_service_thread(switch_thread *thread, void *obj) static void *switch_core_service_thread(switch_thread *thread, void *obj)
{ {
switch_core_thread_session *data = obj; switch_core_thread_session *data = obj;
@ -656,8 +662,9 @@ static void *switch_core_service_thread(switch_thread *thread, void *obj)
data->running = 0; data->running = 0;
return NULL; return NULL;
} }
#pragma warning( pop ) #ifdef WIN32
#pragma warning( pop )
#endif
/* Either add a timeout here or make damn sure the thread cannot get hung somehow (my preference) */ /* Either add a timeout here or make damn sure the thread cannot get hung somehow (my preference) */
SWITCH_DECLARE(void) switch_core_thread_session_end(switch_core_thread_session *thread_session) SWITCH_DECLARE(void) switch_core_thread_session_end(switch_core_thread_session *thread_session)
{ {
@ -1667,13 +1674,17 @@ static void switch_core_standard_on_loopback(switch_core_session *session)
} }
} }
#pragma warning( push ) #ifdef WIN32
#pragma warning( disable : 4100 ) #pragma warning( push )
#pragma warning( disable : 4100 )
#endif
static void switch_core_standard_on_transmit(switch_core_session *session) static void switch_core_standard_on_transmit(switch_core_session *session)
{ {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Standard TRANSMIT\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Standard TRANSMIT\n");
} }
#pragma warning( pop ) #ifdef WIN32
#pragma warning( pop )
#endif
SWITCH_DECLARE(void) switch_core_session_signal_state_change(switch_core_session *session) SWITCH_DECLARE(void) switch_core_session_signal_state_change(switch_core_session *session)
{ {
@ -1989,13 +2000,17 @@ SWITCH_DECLARE(switch_status) switch_core_hash_init(switch_hash **hash, switch_m
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
#pragma warning( push ) #ifdef WIN32
#pragma warning( disable : 4100 ) #pragma warning( push )
#pragma warning( disable : 4100 )
#endif
SWITCH_DECLARE(switch_status) switch_core_hash_destroy(switch_hash *hash) SWITCH_DECLARE(switch_status) switch_core_hash_destroy(switch_hash *hash)
{ {
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
#pragma warning( pop ) #ifdef WIN32
#pragma warning( pop )
#endif
SWITCH_DECLARE(switch_status) switch_core_hash_insert_dup(switch_hash *hash, char *key, void *data) SWITCH_DECLARE(switch_status) switch_core_hash_insert_dup(switch_hash *hash, char *key, void *data)
{ {

8
src/switch_event.c
View File

@ -143,8 +143,10 @@ static int switch_events_match(switch_event *event, switch_event_node *node)
return match; return match;
} }
#pragma warning( push ) #ifdef WIN32
#pragma warning( disable : 4100 ) #pragma warning( push )
#pragma warning( disable : 4100 )
#endif
static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void *obj) static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void *obj)
{ {
switch_event_node *node; switch_event_node *node;
@ -197,7 +199,9 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void
THREAD_RUNNING = 0; THREAD_RUNNING = 0;
return NULL; return NULL;
} }
#ifdef WIN32
#pragma warning( pop ) #pragma warning( pop )
#endif
SWITCH_DECLARE(switch_status) switch_event_running(void) SWITCH_DECLARE(switch_status) switch_event_running(void)
{ {

23
src/switch_loadable_module.c
View File

@ -69,9 +69,10 @@ struct switch_loadable_module_container {
static struct switch_loadable_module_container loadable_modules; static struct switch_loadable_module_container loadable_modules;
#ifdef WIN32
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4100 ) #pragma warning( disable : 4100 )
#endif
static void *switch_loadable_module_exec(switch_thread *thread, void *obj) static void *switch_loadable_module_exec(switch_thread *thread, void *obj)
{ {
switch_status status = SWITCH_STATUS_SUCCESS; switch_status status = SWITCH_STATUS_SUCCESS;
@ -94,8 +95,9 @@ static void *switch_loadable_module_exec(switch_thread *thread, void *obj)
switch_yield(1000000); switch_yield(1000000);
return NULL; return NULL;
} }
#pragma warning( pop ) #ifdef WIN32
#pragma warning( pop )
#endif
static switch_status switch_loadable_module_load_file(char *filename, switch_memory_pool *pool, static switch_status switch_loadable_module_load_file(char *filename, switch_memory_pool *pool,
switch_loadable_module **new_module) switch_loadable_module **new_module)
{ {
@ -507,9 +509,10 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs(switch_memory_pool *pool,
return i; return i;
} }
#ifdef WIN32
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4100 ) #pragma warning( disable : 4100 )
#endif
SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool *pool, switch_codec_interface **array, SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool *pool, switch_codec_interface **array,
int arraylen, char **prefs, int preflen) int arraylen, char **prefs, int preflen)
{ {
@ -527,7 +530,9 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool
return i; return i;
} }
#pragma warning( pop ) #ifdef WIN32
#pragma warning( pop )
#endif
SWITCH_DECLARE(switch_status) switch_api_execute(char *cmd, char *arg, char *retbuf, size_t len) SWITCH_DECLARE(switch_status) switch_api_execute(char *cmd, char *arg, char *retbuf, size_t len)
{ {