From 009e9607e79a23564918c5ae9ad6cea712308bcd Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 21 Feb 2006 18:34:32 +0000 Subject: [PATCH] fix evil pragmas in unix and get rid of horrible ^M in the files (dont do that) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@644 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core.c | 55 +++++++++++++++++++++++------------- src/switch_event.c | 8 ++++-- src/switch_loadable_module.c | 23 +++++++++------ 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/src/switch_core.c b/src/switch_core.c index b05f215949..7831859e68 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -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 */ static struct switch_core_runtime runtime; - -#pragma warning( push ) -#pragma warning( disable : 4100 ) +#ifdef WIN32 +#pragma warning( push ) +#pragma warning( disable : 4100 ) +#endif static int handle_SIGPIPE(int sig) { switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Sig Pipe!\n"); return 0; } -#pragma warning( pop ) - +#ifdef WIN32 +#pragma warning( pop ) #ifdef TRAP_BUS static int handle_SIGBUS(int sig) { @@ -131,17 +132,20 @@ static int handle_SIGBUS(int sig) return 0; } #endif +#endif /* no ctl-c mofo */ - -#pragma warning( push ) -#pragma warning( disable : 4100 ) +#ifdef WIN32 +#pragma warning( push ) +#pragma warning( disable : 4100 ) +#endif static int handle_SIGINT(int sig) { return 0; } -#pragma warning( pop ) - +#ifdef WIN32 +#pragma warning( pop ) +#endif 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; } -#pragma warning( push ) -#pragma warning( disable : 4100 ) +#ifdef WIN32 +#pragma warning( push ) +#pragma warning( disable : 4100 ) +#endif static void *switch_core_service_thread(switch_thread *thread, void *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; 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) */ 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 ) -#pragma warning( disable : 4100 ) +#ifdef WIN32 +#pragma warning( push ) +#pragma warning( disable : 4100 ) +#endif static void switch_core_standard_on_transmit(switch_core_session *session) { 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) { @@ -1989,13 +2000,17 @@ SWITCH_DECLARE(switch_status) switch_core_hash_init(switch_hash **hash, switch_m return SWITCH_STATUS_GENERR; } -#pragma warning( push ) -#pragma warning( disable : 4100 ) +#ifdef WIN32 +#pragma warning( push ) +#pragma warning( disable : 4100 ) +#endif SWITCH_DECLARE(switch_status) switch_core_hash_destroy(switch_hash *hash) { 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) { diff --git a/src/switch_event.c b/src/switch_event.c index 31eabd8033..4fdc30db33 100644 --- a/src/switch_event.c +++ b/src/switch_event.c @@ -143,8 +143,10 @@ static int switch_events_match(switch_event *event, switch_event_node *node) return match; } -#pragma warning( push ) -#pragma warning( disable : 4100 ) +#ifdef WIN32 +#pragma warning( push ) +#pragma warning( disable : 4100 ) +#endif static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void *obj) { switch_event_node *node; @@ -197,7 +199,9 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void THREAD_RUNNING = 0; return NULL; } +#ifdef WIN32 #pragma warning( pop ) +#endif SWITCH_DECLARE(switch_status) switch_event_running(void) { diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c index f61f98a7f0..d6b93e01e4 100644 --- a/src/switch_loadable_module.c +++ b/src/switch_loadable_module.c @@ -69,9 +69,10 @@ struct switch_loadable_module_container { static struct switch_loadable_module_container loadable_modules; - -#pragma warning( push ) -#pragma warning( disable : 4100 ) +#ifdef WIN32 +#pragma warning( push ) +#pragma warning( disable : 4100 ) +#endif static void *switch_loadable_module_exec(switch_thread *thread, void *obj) { switch_status status = SWITCH_STATUS_SUCCESS; @@ -94,8 +95,9 @@ static void *switch_loadable_module_exec(switch_thread *thread, void *obj) switch_yield(1000000); 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, switch_loadable_module **new_module) { @@ -507,9 +509,10 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs(switch_memory_pool *pool, return i; } - -#pragma warning( push ) -#pragma warning( disable : 4100 ) +#ifdef WIN32 +#pragma warning( push ) +#pragma warning( disable : 4100 ) +#endif SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool *pool, switch_codec_interface **array, int arraylen, char **prefs, int preflen) { @@ -527,7 +530,9 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool 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) {