From f36292af0492d92e8bc2992c38c9148776b3d56e Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 22 Feb 2006 22:36:52 +0000 Subject: [PATCH] get rid of unnecessary pragmas. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@655 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core.c | 36 +----------------------------------- src/switch_event.c | 7 ------- src/switch_loadable_module.c | 16 ++-------------- 3 files changed, 3 insertions(+), 56 deletions(-) diff --git a/src/switch_core.c b/src/switch_core.c index 7831859e68..1b67d6a96f 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -114,17 +114,11 @@ 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; -#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; } -#ifdef WIN32 -#pragma warning( pop ) #ifdef TRAP_BUS static int handle_SIGBUS(int sig) { @@ -132,20 +126,12 @@ static int handle_SIGBUS(int sig) return 0; } #endif -#endif /* no ctl-c mofo */ -#ifdef WIN32 -#pragma warning( push ) -#pragma warning( disable : 4100 ) -#endif static int handle_SIGINT(int sig) { return 0; } -#ifdef WIN32 -#pragma warning( pop ) -#endif static void db_pick_path(char *dbname, char *buf, size_t size) { @@ -627,10 +613,6 @@ SWITCH_DECLARE(switch_status) switch_core_timer_destroy(switch_timer *timer) return SWITCH_STATUS_SUCCESS; } -#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; @@ -662,9 +644,7 @@ static void *switch_core_service_thread(switch_thread *thread, void *obj) data->running = 0; return NULL; } -#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) { @@ -1674,17 +1654,10 @@ static void switch_core_standard_on_loopback(switch_core_session *session) } } -#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"); } -#ifdef WIN32 -#pragma warning( pop ) -#endif SWITCH_DECLARE(void) switch_core_session_signal_state_change(switch_core_session *session) { @@ -2000,17 +1973,10 @@ SWITCH_DECLARE(switch_status) switch_core_hash_init(switch_hash **hash, switch_m return SWITCH_STATUS_GENERR; } -#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; } -#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 4fdc30db33..817088e309 100644 --- a/src/switch_event.c +++ b/src/switch_event.c @@ -143,10 +143,6 @@ static int switch_events_match(switch_event *event, switch_event_node *node) return match; } -#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; @@ -199,9 +195,6 @@ 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 d6b93e01e4..0262cb179f 100644 --- a/src/switch_loadable_module.c +++ b/src/switch_loadable_module.c @@ -69,10 +69,6 @@ struct switch_loadable_module_container { static struct switch_loadable_module_container loadable_modules; -#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; @@ -95,9 +91,7 @@ static void *switch_loadable_module_exec(switch_thread *thread, void *obj) switch_yield(1000000); return NULL; } -#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) { @@ -509,10 +503,7 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs(switch_memory_pool *pool, return i; } -#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) { @@ -530,9 +521,6 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool return i; } -#ifdef WIN32 -#pragma warning( pop ) -#endif SWITCH_DECLARE(switch_status) switch_api_execute(char *cmd, char *arg, char *retbuf, size_t len) {