Author: anthm Date: Thu Sep 7 10:23:31 2006 New Revision: 2548 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/include/switch_buffer.h freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_config.h freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_log.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_resample.h freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_sqlite.h freeswitch/trunk/src/include/switch_stun.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/include/switch_xml.h Log: fix namespace Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Thu Sep 7 10:23:31 2006 @@ -36,10 +36,10 @@ #define SWITCH_H #ifdef __cplusplus -#define BEGIN_EXTERN_C extern "C" { +#define SWITCH_BEGIN_EXTERN_C extern "C" { #define END_EXTERN_C } #else -#define BEGIN_EXTERN_C +#define SWITCH_BEGIN_EXTERN_C #define END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Thu Sep 7 10:23:31 2006 @@ -63,7 +63,7 @@ #include <apr_want.h> #include <apr_env.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /* The pieces of apr we allow ppl to pass around between modules we typedef into our namespace and wrap all the functions Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Thu Sep 7 10:23:31 2006 @@ -35,7 +35,7 @@ */ #ifndef SWITCH_BITPACK_H #define SWITCH_BITPACK_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #include <switch.h> Modified: freeswitch/trunk/src/include/switch_buffer.h ============================================================================== --- freeswitch/trunk/src/include/switch_buffer.h (original) +++ freeswitch/trunk/src/include/switch_buffer.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /** * @defgroup switch_buffer Buffer Routines Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Thu Sep 7 10:23:31 2006 @@ -55,7 +55,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief Call Specific Data */ Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C struct switch_channel_timetable { switch_time_t created; Modified: freeswitch/trunk/src/include/switch_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_config.h (original) +++ freeswitch/trunk/src/include/switch_config.h Thu Sep 7 10:23:31 2006 @@ -58,7 +58,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief A simple file handle representing an open configuration file **/ struct switch_config { Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Thu Sep 7 10:23:31 2006 @@ -41,7 +41,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_CMD_CHUNK_LEN 1024 #define SWITCH_STANDARD_STREAM(s) if ((s.data = (char *)malloc(SWITCH_CMD_CHUNK_LEN))) { \ memset(s.data, 0, SWITCH_CMD_CHUNK_LEN); \ Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_MAX_CORE_THREAD_SESSION_OBJS 128 #define SWITCH_MAX_STREAMS 128 Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Thu Sep 7 10:23:31 2006 @@ -60,7 +60,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief An event Header */ struct switch_event_header{ Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Thu Sep 7 10:23:31 2006 @@ -38,7 +38,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief An abstraction of a data frame */ struct switch_frame { Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C static const switch_state_handler_table_t noop_state_handler = {0}; Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Sep 7 10:23:31 2006 @@ -43,7 +43,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \defgroup mods Loadable Module Functions Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C ///\defgroup log Logger Routines ///\ingroup core1 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Sep 7 10:23:31 2006 @@ -41,7 +41,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief A table of functions to execute at various states */ Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Thu Sep 7 10:23:31 2006 @@ -34,7 +34,7 @@ #ifndef SWITCH_PLATFORM_H #define SWITCH_PLATFORM_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #ifdef __ICC #pragma warning (disable:810 869 981 279 1469 188) Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Thu Sep 7 10:23:31 2006 @@ -43,7 +43,7 @@ #define SWITCH_RESAMPLE_H #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #include <stdlib.h> /*! Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Thu Sep 7 10:23:31 2006 @@ -38,7 +38,7 @@ #ifndef SWITCH_RTP_H #define SWITCH_RTP_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_RTP_MAX_BUF_LEN 16384 Modified: freeswitch/trunk/src/include/switch_sqlite.h ============================================================================== --- freeswitch/trunk/src/include/switch_sqlite.h (original) +++ freeswitch/trunk/src/include/switch_sqlite.h Thu Sep 7 10:23:31 2006 @@ -35,7 +35,7 @@ #ifndef SWITCH_SQLITE_H #define SWITCH_SQLITE_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #include <sqlite3.h> Modified: freeswitch/trunk/src/include/switch_stun.h ============================================================================== --- freeswitch/trunk/src/include/switch_stun.h (original) +++ freeswitch/trunk/src/include/switch_stun.h Thu Sep 7 10:23:31 2006 @@ -37,7 +37,7 @@ #ifndef _SWITCH_STUN_PARSER_H #define _SWITCH_STUN_PARSER_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_STUN_DEFAULT_PORT 3478 #define SWITCH_STUN_PACKET_MIN_LEN 20 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Sep 7 10:23:31 2006 @@ -36,7 +36,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #ifdef WIN32 #define SWITCH_PATH_SEPARATOR "\\" Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #ifndef snprintf #define snprintf apr_snprintf Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu Sep 7 10:23:31 2006 @@ -65,7 +65,7 @@ ///\defgroup xml1 XML Library Functions ///\ingroup core1 ///\{ -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_XML_BUFSIZE 1024 // size of internal memory buffers