fix namespace

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2548 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch.h b/src/include/switch.h
index 74ea3554fbd031dcef4dcd1849e221f271bb8ef8..a144a13163c5f394c2ce20720a8308d7b0288dd5 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -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
 

diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index 3955576def4b78e39d2adf48c176639ad0634b86..192f318d49041103f26dbc1a647e7ae89e9b489f 100644 (file)
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -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

diff --git a/src/include/switch_bitpack.h b/src/include/switch_bitpack.h
index c7d98a722c7f948361f6c83f71396b4094aebec9..1f8a964ea81b7ff1bfb19dec4b2c80d6c847ff42 100644 (file)
--- a/src/include/switch_bitpack.h
+++ b/src/include/switch_bitpack.h
@@ -35,7 +35,7 @@
 */
 #ifndef SWITCH_BITPACK_H
 #define SWITCH_BITPACK_H
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 #include <switch.h>
 

diff --git a/src/include/switch_buffer.h b/src/include/switch_buffer.h
index 141d1310a7773bc5e11459a023b77584665751ab..c2e491c0ecb3350b6099777adf935d42beb2befc 100644 (file)
--- a/src/include/switch_buffer.h
+++ b/src/include/switch_buffer.h
@@ -40,7 +40,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 /**
  * @defgroup switch_buffer Buffer Routines

diff --git a/src/include/switch_caller.h b/src/include/switch_caller.h
index ca42dcd56bcb2b7352b64cba1ba895b767a9ed2d..fb2a44cf9509404e731320eade6b2d6eb9d28d32 100644 (file)
--- a/src/include/switch_caller.h
+++ b/src/include/switch_caller.h
@@ -55,7 +55,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 /*! \brief Call Specific Data
  */

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 7ec2995e9861c21e626c5ebd8040dabd2351cff1..375497464f6b6962a7e7b3c9bc58c81209bb187c 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -40,7 +40,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 struct switch_channel_timetable {
        switch_time_t created;

diff --git a/src/include/switch_config.h b/src/include/switch_config.h
index 50c7908a698ddb61ef0400a63236cf0084dc238a..98607415f7481c180d065c9a3d475c169c5f3df0 100644 (file)
--- a/src/include/switch_config.h
+++ b/src/include/switch_config.h
@@ -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 {

diff --git a/src/include/switch_console.h b/src/include/switch_console.h
index 8833b5b517540f10daa8378b245e90d4917e9590..62e1195d0a415250b47abd4f90022441b6b81516 100644 (file)
--- a/src/include/switch_console.h
+++ b/src/include/switch_console.h
@@ -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);                                                \

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 7335d7f7e8bfefa0591a68f22f39a810d2ca0c3b..5756cd6edc2e12686f0531d78db018ab30e1f80f 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -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

diff --git a/src/include/switch_event.h b/src/include/switch_event.h
index a5a386cca4c28664381b8bb42f9f08c66e1166cc..93b9a85826ee5a794c4b15d4ca71161ba2176020 100644 (file)
--- a/src/include/switch_event.h
+++ b/src/include/switch_event.h
@@ -60,7 +60,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 /*! \brief An event Header */
 struct switch_event_header{

diff --git a/src/include/switch_frame.h b/src/include/switch_frame.h
index 328f6e52531d6d7580bd48f846c1f49d7eef0e45..659cd6d062de886463989e669ac15773343eaf6d 100644 (file)
--- a/src/include/switch_frame.h
+++ b/src/include/switch_frame.h
@@ -38,7 +38,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 /*! \brief An abstraction of a data frame */
 struct switch_frame {

diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index af215fa6f4d0cce55fa2c0695d7d48c506fa2515..21a09b749ffe7a27ce9b5a39e25cba251edd8338 100644 (file)
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -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};
 

diff --git a/src/include/switch_loadable_module.h b/src/include/switch_loadable_module.h
index ad2002dab634d3c8e7544c99076285c3c3d995ba..68b86e8202c5e3ade68c7e9fc14fd672bb60c7fa 100644 (file)
--- a/src/include/switch_loadable_module.h
+++ b/src/include/switch_loadable_module.h
@@ -43,7 +43,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 /*!
   \defgroup mods Loadable Module Functions

diff --git a/src/include/switch_log.h b/src/include/switch_log.h
index eba31229cb662ce8fcf7b3fa82ef4ee99b6bb74c..317ca6dc144d93fbf22cb28d596f4dc98b8d75be 100644 (file)
--- a/src/include/switch_log.h
+++ b/src/include/switch_log.h
@@ -40,7 +40,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 ///\defgroup log Logger Routines
 ///\ingroup core1

diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h
index 56c330d018f03df61e218d1db10b57efab3a6688..f932754e1f76ba0d8710906ec424bcd3aa967c46 100644 (file)
--- a/src/include/switch_module_interfaces.h
+++ b/src/include/switch_module_interfaces.h
@@ -41,7 +41,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 /*! \brief A table of functions to execute at various states 
 */

diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index c86c9461fabdf6bc7a53af6a1d0857d8ff20127f..b969eae7cf2dfa0f88e6e9a2f35ce4a7907c6405 100644 (file)
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -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)

diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h
index 8ff5438f98fcc6046755443fe52b99b4ec810081..d9dd41e582e2e176c7422f4270d0d5052d65950e 100644 (file)
--- a/src/include/switch_resample.h
+++ b/src/include/switch_resample.h
@@ -43,7 +43,7 @@
 #define SWITCH_RESAMPLE_H
 
 #include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 #include <stdlib.h>
 
 /*!

diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h
index 9f4cc5104555232e5ca3e9a025171c70993db10d..e252bf0b23619689938ab604afd9ec3201582a10 100644 (file)
--- a/src/include/switch_rtp.h
+++ b/src/include/switch_rtp.h
@@ -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
 

diff --git a/src/include/switch_sqlite.h b/src/include/switch_sqlite.h
index 92e092a85b59b4d5a1a01e51826a53f159472548..2665ac357bee943c36fe6309efec1fe6d637c9cf 100644 (file)
--- a/src/include/switch_sqlite.h
+++ b/src/include/switch_sqlite.h
@@ -35,7 +35,7 @@
 #ifndef SWITCH_SQLITE_H
 #define SWITCH_SQLITE_H
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 #include <sqlite3.h>
 

diff --git a/src/include/switch_stun.h b/src/include/switch_stun.h
index 1017f302eac2be49cd9fdda1c7dfeddeff9deea7..55807dcd903bec609691da689586f8afa2074d7c 100644 (file)
--- a/src/include/switch_stun.h
+++ b/src/include/switch_stun.h
@@ -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

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 9f99b0a3d865aebe1073ebeeb54c018e39b6d32c..45279da11fd09d93a636253150f0e1a12cd6bb9f 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -36,7 +36,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 #ifdef WIN32
 #define SWITCH_PATH_SEPARATOR "\\"

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 898456fb5a6740756b087947e8350c090d781d71..c5125d284d16752bb7a4e943badf3a442cd0cc93 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -40,7 +40,7 @@
 
 #include <switch.h>
 
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
 
 #ifndef snprintf
 #define snprintf apr_snprintf

diff --git a/src/include/switch_xml.h b/src/include/switch_xml.h
index 82f305da8407e12d8e3f257e7eaa6cb6cc02d75f..b6193d03fd3b378e17220572ee2351e576226e8b 100644 (file)
--- a/src/include/switch_xml.h
+++ b/src/include/switch_xml.h
@@ -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