Author: brian Date: Sun Jan 27 12:42:51 2008 New Revision: 7394 Modified: freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_log.c freeswitch/trunk/src/switch_odbc.c freeswitch/trunk/src/switch_regex.c freeswitch/trunk/src/switch_resample.c freeswitch/trunk/src/switch_scheduler.c freeswitch/trunk/src/switch_stun.c freeswitch/trunk/src/switch_swig.c freeswitch/trunk/src/switch_time.c freeswitch/trunk/src/switch_utils.c Log: more cleanup before I leave LAX Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Sun Jan 27 12:42:51 2008 @@ -32,6 +32,7 @@ * switch_ivr_play_say.c -- IVR Library (functions to play or say audio) * */ + #include <switch.h> static char *SAY_METHOD_NAMES[] = { @@ -64,7 +65,6 @@ NULL }; - static switch_say_method_t get_say_method_by_name(char *name) { int x = 0; @@ -89,7 +89,6 @@ 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) { Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sun Jan 27 12:42:51 2008 @@ -29,6 +29,7 @@ * switch_loadable_module.c -- Loadable Modules * */ + #include <switch.h> /* for apr_pstrcat */ Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Sun Jan 27 12:42:51 2008 @@ -29,10 +29,10 @@ * switch_log.c -- Logging * */ + #include <switch.h> #include "private/switch_core_pvt.h" - static const char *LEVELS[] = { "CONSOLE", "ALERT", Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Sun Jan 27 12:42:51 2008 @@ -28,6 +28,7 @@ * switch_odbc.c -- ODBC * */ + #include <switch.h> #include <switch_odbc.h> Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Sun Jan 27 12:42:51 2008 @@ -33,7 +33,6 @@ #include <switch.h> #include <pcre.h> - 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 @@ } - 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); Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Sun Jan 27 12:42:51 2008 @@ -29,6 +29,7 @@ * switch_caller.c -- Caller Identification * */ + #include <switch.h> #include <switch_resample.h> #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) { Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Sun Jan 27 12:42:51 2008 @@ -29,8 +29,8 @@ * switch_scheduler.c -- Switch Scheduler * */ -#include <switch.h> +#include <switch.h> struct switch_scheduler_task_container { switch_scheduler_task_t task; @@ -45,7 +45,6 @@ }; 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; Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Sun Jan 27 12:42:51 2008 @@ -30,6 +30,7 @@ * switch_stun.c STUN (Simple Traversal of UDP over NAT) * */ + #include <switch.h> #include <switch_stun.h> Modified: freeswitch/trunk/src/switch_swig.c ============================================================================== --- freeswitch/trunk/src/switch_swig.c (original) +++ freeswitch/trunk/src/switch_swig.c Sun Jan 27 12:42:51 2008 @@ -34,8 +34,6 @@ #pragma warning (disable:1418) #endif - - #ifdef _MSC_VER #include <php.h> #pragma comment(lib, PHP_LIB) Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Sun Jan 27 12:42:51 2008 @@ -29,6 +29,7 @@ * softtimer.c -- Software Timer Module * */ + #include <switch.h> #include <stdio.h> #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 { Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sun Jan 27 12:42:51 2008 @@ -30,6 +30,7 @@ * switch_utils.c -- Compatability and Helper Code * */ + #include <switch.h> #ifndef WIN32 #include <arpa/inet.h>