From 935cbcf9374a140cc941121db3731badada974ff Mon Sep 17 00:00:00 2001 From: Brian West Date: Sun, 27 Jan 2008 17:42:51 +0000 Subject: [PATCH] more cleanup before I leave LAX git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7394 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_ivr_play_say.c | 3 +-- src/switch_loadable_module.c | 1 + src/switch_log.c | 2 +- src/switch_odbc.c | 1 + src/switch_regex.c | 2 -- src/switch_resample.c | 3 +-- src/switch_scheduler.c | 3 +-- src/switch_stun.c | 1 + src/switch_swig.c | 2 -- src/switch_time.c | 2 +- src/switch_utils.c | 1 + 11 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c index 658470b3a7..58dda917a4 100644 --- a/src/switch_ivr_play_say.c +++ b/src/switch_ivr_play_say.c @@ -32,6 +32,7 @@ * switch_ivr_play_say.c -- IVR Library (functions to play or say audio) * */ + #include static char *SAY_METHOD_NAMES[] = { @@ -64,7 +65,6 @@ static char *SAY_TYPE_NAMES[] = { NULL }; - static switch_say_method_t get_say_method_by_name(char *name) { int x = 0; @@ -89,7 +89,6 @@ static switch_say_type_t get_say_type_by_name(char *name) return (switch_say_type_t) x; } - SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, const char *macro_name, const char *data, const char *lang, switch_input_args_t *args) { diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c index ac5dc3d386..470d308a91 100644 --- a/src/switch_loadable_module.c +++ b/src/switch_loadable_module.c @@ -29,6 +29,7 @@ * switch_loadable_module.c -- Loadable Modules * */ + #include /* for apr_pstrcat */ diff --git a/src/switch_log.c b/src/switch_log.c index 1685f03330..66d51a36a5 100644 --- a/src/switch_log.c +++ b/src/switch_log.c @@ -29,10 +29,10 @@ * switch_log.c -- Logging * */ + #include #include "private/switch_core_pvt.h" - static const char *LEVELS[] = { "CONSOLE", "ALERT", diff --git a/src/switch_odbc.c b/src/switch_odbc.c index a9d38b0445..c75fbc9ca4 100644 --- a/src/switch_odbc.c +++ b/src/switch_odbc.c @@ -28,6 +28,7 @@ * switch_odbc.c -- ODBC * */ + #include #include diff --git a/src/switch_regex.c b/src/switch_regex.c index 146da45fa6..667ac43840 100644 --- a/src/switch_regex.c +++ b/src/switch_regex.c @@ -33,7 +33,6 @@ #include #include - SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern, int options, const char **errorptr, int *erroroffset, const unsigned char *tables) @@ -43,7 +42,6 @@ return pcre_compile(pattern, options, errorptr, erroroffset, tables); } - SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size) { return pcre_copy_substring(subject, ovector, stringcount, stringnumber, buffer, size); diff --git a/src/switch_resample.c b/src/switch_resample.c index 0b0e604c05..cda0424074 100644 --- a/src/switch_resample.c +++ b/src/switch_resample.c @@ -29,6 +29,7 @@ * switch_caller.c -- Caller Identification * */ + #include #include #ifndef WIN32 @@ -50,8 +51,6 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif - - SWITCH_DECLARE(switch_status_t) switch_resample_create(switch_audio_resampler_t **new_resampler, int from_rate, switch_size_t from_size, int to_rate, uint32_t to_size, switch_memory_pool_t *pool) { diff --git a/src/switch_scheduler.c b/src/switch_scheduler.c index a46ac0f689..5ac1105126 100644 --- a/src/switch_scheduler.c +++ b/src/switch_scheduler.c @@ -29,8 +29,8 @@ * switch_scheduler.c -- Switch Scheduler * */ -#include +#include struct switch_scheduler_task_container { switch_scheduler_task_t task; @@ -45,7 +45,6 @@ struct switch_scheduler_task_container { }; typedef struct switch_scheduler_task_container switch_scheduler_task_container_t; - static struct { switch_scheduler_task_container_t *task_list; switch_mutex_t *task_mutex; diff --git a/src/switch_stun.c b/src/switch_stun.c index 37e6f973bb..817324a5fa 100644 --- a/src/switch_stun.c +++ b/src/switch_stun.c @@ -30,6 +30,7 @@ * switch_stun.c STUN (Simple Traversal of UDP over NAT) * */ + #include #include diff --git a/src/switch_swig.c b/src/switch_swig.c index 83e00fbfa5..e5e81ba13b 100644 --- a/src/switch_swig.c +++ b/src/switch_swig.c @@ -34,8 +34,6 @@ #pragma warning (disable:1418) #endif - - #ifdef _MSC_VER #include #pragma comment(lib, PHP_LIB) diff --git a/src/switch_time.c b/src/switch_time.c index 783f5255a3..e735789909 100644 --- a/src/switch_time.c +++ b/src/switch_time.c @@ -29,6 +29,7 @@ * softtimer.c -- Software Timer Module * */ + #include #include #include "private/switch_core_pvt.h" @@ -39,7 +40,6 @@ #define MAX_TICK UINT32_MAX - 1024 - static switch_memory_pool_t *module_pool = NULL; static struct { diff --git a/src/switch_utils.c b/src/switch_utils.c index d3b4efcb00..3af7769c71 100644 --- a/src/switch_utils.c +++ b/src/switch_utils.c @@ -30,6 +30,7 @@ * switch_utils.c -- Compatability and Helper Code * */ + #include #ifndef WIN32 #include