fix C linkage when using templates issue when building C++ modules in msvc that stems...

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

diff --git a/src/include/switch.h b/src/include/switch.h
index af9db6b0d954d2cb60d89ba6306f4156bdf97757..63e23c3665fa219efdf6192f68850a4f33954910 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -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 @@ BEGIN_EXTERN_C
 #include <switch_log.h>
 #include <switch_xml.h>
 
-END_EXTERN_C
 
 /** \mainpage FreeSWITCH
  * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application

diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index db23f325577e7d50572d478064f4a69c522c19e7..f90282ec47a5030dc07d3b18a0f36c4159d02533 100644 (file)
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -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>
@@ -65,6 +63,8 @@ BEGIN_EXTERN_C
 #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
    any other apr code should be as hidden as possible.

diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index 9557dc193a91a8858f1f93941ef361e87542d80d..aadd8343dfe173923805eb4c9bbfc18d7700d9d5 100644 (file)
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -65,7 +65,7 @@ BEGIN_EXTERN_C
  * 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