fix namespace

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

fix namespace
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2548 d0543943-73ff-0310-b7d9-9358b9ac24b2
a4c778a0 · Anthony Minessale · 64b0912e · a4c778a0 · a4c778a0 · a4c778a0
--- 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


--- 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

--- 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>


--- 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

--- 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
 */

--- 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;

--- 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 {

--- 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);						\

--- 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

--- 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{

--- 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 {

--- 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};


--- 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

--- 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

--- 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 
 */

--- 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)

--- 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>

 /*!

--- 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


--- 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>


--- 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

--- 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 "\\"

--- 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

--- 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