forked from Mirrors/freeswitch
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++.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2070 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
4ef2d76948
commit
85d442615e
@ -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
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user