diff --git a/src/include/switch.h b/src/include/switch.h index 74ea3554fb..a144a13163 100644 --- 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 3955576def..192f318d49 100644 --- a/src/include/switch_apr.h +++ b/src/include/switch_apr.h @@ -63,7 +63,7 @@ #include #include -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 c7d98a722c..1f8a964ea8 100644 --- 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 diff --git a/src/include/switch_buffer.h b/src/include/switch_buffer.h index 141d1310a7..c2e491c0ec 100644 --- a/src/include/switch_buffer.h +++ b/src/include/switch_buffer.h @@ -40,7 +40,7 @@ #include -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 ca42dcd56b..fb2a44cf95 100644 --- a/src/include/switch_caller.h +++ b/src/include/switch_caller.h @@ -55,7 +55,7 @@ #include -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 7ec2995e98..375497464f 100644 --- a/src/include/switch_channel.h +++ b/src/include/switch_channel.h @@ -40,7 +40,7 @@ #include -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 50c7908a69..98607415f7 100644 --- a/src/include/switch_config.h +++ b/src/include/switch_config.h @@ -58,7 +58,7 @@ #include -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 8833b5b517..62e1195d0a 100644 --- a/src/include/switch_console.h +++ b/src/include/switch_console.h @@ -41,7 +41,7 @@ #include -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 7335d7f7e8..5756cd6edc 100644 --- a/src/include/switch_core.h +++ b/src/include/switch_core.h @@ -40,7 +40,7 @@ #include -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 a5a386cca4..93b9a85826 100644 --- a/src/include/switch_event.h +++ b/src/include/switch_event.h @@ -60,7 +60,7 @@ #include -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 328f6e5253..659cd6d062 100644 --- a/src/include/switch_frame.h +++ b/src/include/switch_frame.h @@ -38,7 +38,7 @@ #include -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 af215fa6f4..21a09b749f 100644 --- a/src/include/switch_ivr.h +++ b/src/include/switch_ivr.h @@ -40,7 +40,7 @@ #include -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 ad2002dab6..68b86e8202 100644 --- a/src/include/switch_loadable_module.h +++ b/src/include/switch_loadable_module.h @@ -43,7 +43,7 @@ #include -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 eba31229cb..317ca6dc14 100644 --- a/src/include/switch_log.h +++ b/src/include/switch_log.h @@ -40,7 +40,7 @@ #include -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 56c330d018..f932754e1f 100644 --- a/src/include/switch_module_interfaces.h +++ b/src/include/switch_module_interfaces.h @@ -41,7 +41,7 @@ #include -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 c86c9461fa..b969eae7cf 100644 --- 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 8ff5438f98..d9dd41e582 100644 --- a/src/include/switch_resample.h +++ b/src/include/switch_resample.h @@ -43,7 +43,7 @@ #define SWITCH_RESAMPLE_H #include -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #include /*! diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h index 9f4cc51045..e252bf0b23 100644 --- 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 92e092a85b..2665ac357b 100644 --- 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 diff --git a/src/include/switch_stun.h b/src/include/switch_stun.h index 1017f302ea..55807dcd90 100644 --- 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 9f99b0a3d8..45279da11f 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -36,7 +36,7 @@ #include -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 898456fb5a..c5125d284d 100644 --- a/src/include/switch_utils.h +++ b/src/include/switch_utils.h @@ -40,7 +40,7 @@ #include -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 82f305da84..b6193d03fd 100644 --- 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