Author: mikej Date: Mon Jul 24 00:31:28 2006 New Revision: 2070 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_platform.h Log: fix C linkage when using templates issue when building C++ modules in msvc that stems from including some windows header files inside of an extern C block, when building with C++. Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Mon Jul 24 00:31:28 2006 @@ -43,7 +43,6 @@ #define END_EXTERN_C #endif -BEGIN_EXTERN_C //Need to include this before any other includes (MSVC Bug) #include <switch_platform.h> @@ -75,7 +74,6 @@ #include <switch_log.h> #include <switch_xml.h> -END_EXTERN_C /** \mainpage FreeSWITCH * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Mon Jul 24 00:31:28 2006 @@ -39,8 +39,6 @@ #ifndef SWITCH_APR_H #define SWITCH_APR_H -BEGIN_EXTERN_C - #include <apr.h> #include <apr_network_io.h> #include <apr_errno.h> @@ -64,6 +62,8 @@ #define APR_WANT_STRFUNC #include <apr_want.h> #include <apr_env.h> + +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_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Jul 24 00:31:28 2006 @@ -65,7 +65,7 @@ * C4819: The file contains a character that cannot be represented in the current code page * C4132: 'object' : const object should be initialized (fires innapropriately for prototyped forward declaration of cost var) */ -#pragma warning(disable:4152 4054 4100 4142 4200 4204 4706 4055 4214 4819 4132) +#pragma warning(disable:4152 4054 4100 4142 4200 4204 4706 4055 4214 4819 4132 4510 4512 4610) #if (_MSC_VER >= 1400) // VC8+ #ifndef _CRT_SECURE_NO_DEPRECATE