Commit 7ceddff0 authored by Ghislain MARY's avatar Ghislain MARY

Do not rename files to compile them as C++.

parent d88e17cd
......@@ -274,6 +274,9 @@ else()
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
list(APPEND STRICT_OPTIONS_CPP "-Qunused-arguments" "-Wno-array-bounds")
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
list(APPEND STRICT_OPTIONS_CXX "-x c++")
endif()
if(APPLE)
list(APPEND STRICT_OPTIONS_CPP "-Wno-error=unknown-warning-option" "-Qunused-arguments" "-Wno-tautological-compare" "-Wno-unused-function" "-Wno-array-bounds")
endif()
......
......@@ -36,93 +36,90 @@ endif()
set(LINPHONE_PRIVATE_HEADER_FILES
bellesip_sal/sal_impl.h
CardDav.h
Conference.h
ContactProvider.h
Enum.h
Lime.h
Lpc2Xml.h
OfferAnswer.h
carddav.h
conference_private.h
contact_providers_priv.h
enum.h
lime.h
lpc2xml.h
offeranswer.h
private.h
QualityReporting.h
Sqlite3BctbxVfs.h
Vcard.h
Xml2Lpc.h
quality_reporting.h
sqlite3_bctbx_vfs.h
vcard_private.h
xml2lpc.h
)
set(LINPHONE_SOURCE_FILES_C
bellesip_sal/sal_address_impl.cc
bellesip_sal/sal_impl.cc
bellesip_sal/sal_op_call.cc
bellesip_sal/sal_op_call_transfer.cc
bellesip_sal/sal_op_events.cc
bellesip_sal/sal_op_impl.cc
bellesip_sal/sal_op_info.cc
bellesip_sal/sal_op_message.cc
bellesip_sal/sal_op_presence.cc
bellesip_sal/sal_op_publish.cc
bellesip_sal/sal_op_registration.cc
bellesip_sal/sal_sdp.cc
account_creator.c
account_creator_service.c
address.c
authentication.c
bellesip_sal/sal_address_impl.c
bellesip_sal/sal_impl.c
bellesip_sal/sal_op_call.c
bellesip_sal/sal_op_call_transfer.c
bellesip_sal/sal_op_events.c
bellesip_sal/sal_op_impl.c
bellesip_sal/sal_op_info.c
bellesip_sal/sal_op_message.c
bellesip_sal/sal_op_presence.c
bellesip_sal/sal_op_publish.c
bellesip_sal/sal_op_registration.c
bellesip_sal/sal_sdp.c
buffer.c
callbacks.c
call_log.c
call_params.c
carddav.c
chat.c
chat_file_transfer.c
contactprovider.c
content.c
dial_plan.c
dict.c
ec-calibrator.c
echo-tester.c
enum.c
error_info.c
event.c
factory.c
friend.c
friendlist.c
im_notif_policy.c
info.c
ldapprovider.c
lime.c
im_encryption_engine.c
linphonecall.c
linphonecore.c
linphone_tunnel_config.c
localplayer.c
lpc2xml.c
lpconfig.c
lsd.c
message_storage.c
misc.c
nat_policy.c
offeranswer.c
payload_type.c
player.c
presence.c
proxy.c
quality_reporting.c
remote_provisioning.c
ringtoneplayer.c
sal.c
siplogin.c
sipsetup.c
sqlite3_bctbx_vfs.c
video_definition.c
xml2lpc.c
xml.c
xmlrpc.c
vtables.c
)
set(LINPHONE_SOURCE_FILES_CXX
AccountCreator.cc
AccountCreatorService.cc
Address.cc
Authentication.cc
Buffer.cc
Call.cc
Callbacks.cc
CallLog.cc
CallParams.cc
CardDav.cc
Chat.cc
ChatFileTransfer.cc
Conference.cc
Config.cc
ContactProvider.cc
Content.cc
Core.cc
DialPlan.cc
Dict.cc
EcCalibrator.cc
EchoTester.cc
Enum.cc
ErrorInfo.cc
Event.cc
Factory.cc
Friend.cc
FriendList.cc
ImEncryptionEngine.cc
ImNotifPolicy.cc
Info.cc
LdapProvider.cc
Lime.cc
LocalPlayer.cc
Lpc2Xml.cc
Lsd.cc
MessageStorage.cc
Misc.cc
NatPolicy.cc
OfferAnswer.cc
PayloadType.cc
Player.cc
Presence.cc
Proxy.cc
QualityReporting.cc
RemoteProvisioning.cc
RingTonePlayer.cc
Sal.cc
SipLogin.cc
SipSetup.cc
Sqlite3BctbxVfs.cc
TunnelConfig.cc
VideoDefinition.cc
Vtables.cc
Xml.cc
Xml2Lpc.cc
XmlRpc.cc
)
set(LINPHONE_SOURCE_FILES_CXX conference.cc)
if(ANDROID)
list(APPEND LINPHONE_SOURCE_FILES_CXX linphonecore_jni.cc)
set_source_files_properties(linphonecore_jni.cc PROPERTIES COMPILE_DEFINITIONS "USE_JAVAH")
......@@ -137,12 +134,12 @@ endif()
if(ENABLE_TUNNEL)
list(APPEND LINPHONE_SOURCE_FILES_CXX
Tunnel.cc
linphone_tunnel.cc
TunnelManager.cc
)
add_definitions(-DTUNNEL_ENABLED)
else()
list(APPEND LINPHONE_SOURCE_FILES_CXX TunnelStubs.cc)
list(APPEND LINPHONE_SOURCE_FILES_C linphone_tunnel_stubs.c)
endif()
bc_git_version(liblinphone ${PROJECT_VERSION})
......@@ -188,7 +185,7 @@ if(INTL_FOUND)
endif()
if(BELCARD_FOUND)
list(APPEND LIBS ${BELCARD_LIBRARIES})
list(APPEND LINPHONE_SOURCE_FILES_CXX Vcard.cc)
list(APPEND LINPHONE_SOURCE_FILES_CXX vcard.cc)
if(NOT MSVC)
list(APPEND STRICT_OPTIONS_CXX "-std=c++11")
endif()
......@@ -196,10 +193,11 @@ if(BELCARD_FOUND)
list(APPEND STRICT_OPTIONS_CXX "-stdlib=libc++")
endif()
else()
list(APPEND LINPHONE_SOURCE_FILES_CXX VcardStubs.c)
list(APPEND LINPHONE_SOURCE_FILES_C vcard_stubs.c)
endif()
bc_apply_compile_flags(LINPHONE_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
set_source_files_properties(${LINPHONE_SOURCE_FILES_C} PROPERTIES LANGUAGE CXX)
bc_apply_compile_flags(LINPHONE_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX)
bc_apply_compile_flags(LINPHONE_SOURCE_FILES_CXX STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX)
bc_apply_compile_flags(LINPHONE_SOURCE_FILES_OBJC STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC)
......
......@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "sal_impl.h"
#include "OfferAnswer.h"
#include "offeranswer.h"
#include <bctoolbox/defs.h>
......
......@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "sal_impl.h"
#include "OfferAnswer.h"
#include "offeranswer.h"
......
......@@ -25,7 +25,7 @@
#include "linphone/core.h"
#include "private.h"
#include "Conference.h"
#include "conference_private.h"
#include <mediastreamer2/msvolume.h>
#include <typeinfo>
#include <list>
......
......@@ -14,7 +14,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "ContactProvider.h"
#include "contact_providers_priv.h"
#include "linphone/contactprovider.h"
#include <linphone/core.h>
......
......@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <string.h>
#include "Enum.h"
#include "enum.h"
#define DNS_ANSWER_MAX_SIZE 2048
......
......@@ -17,7 +17,7 @@
#include "linphone/ldapprovider.h"
#include "private.h"
#include "linphone/lpconfig.h"
#include "ContactProvider.h"
#include "contact_providers_priv.h"
#include "mediastreamer2/mscommon.h"
#include <belle-sip/dict.h>
......
......@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "Lime.h"
#include "lime.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
......
......@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/sipsetup.h"
#include "linphone/lpconfig.h"
#include "private.h"
#include "Conference.h"
#include "conference_private.h"
#include <ortp/event.h>
#include <ortp/b64.h>
......@@ -2733,7 +2733,7 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
framesize=lp_config_get_int(lc->config,"sound","ec_framesize",0);
audio_stream_set_echo_canceller_params(audiostream,len,delay,framesize);
if (audiostream->ec) {
char *statestr=(char *)ms_malloc0(EC_STATE_MAX_LEN);
char *statestr=reinterpret_cast<char *>(ms_malloc0(EC_STATE_MAX_LEN));
if (lp_config_relative_file_exists(lc->config, EC_STATE_STORE)
&& lp_config_read_relative_file(lc->config, EC_STATE_STORE, statestr, EC_STATE_MAX_LEN) == 0) {
ms_filter_call_method(audiostream->ec, MS_ECHO_CANCELLER_SET_STATE_STRING, statestr);
......
......@@ -22,12 +22,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/sipsetup.h"
#include "linphone/lpconfig.h"
#include "private.h"
#include "QualityReporting.h"
#include "Lime.h"
#include "Conference.h"
#include "quality_reporting.h"
#include "lime.h"
#include "conference_private.h"
#ifdef SQLITE_STORAGE_ENABLED
#include "Sqlite3BctbxVfs.h"
#include "sqlite3_bctbx_vfs.h"
#endif
#include <math.h>
......@@ -116,8 +116,8 @@ static void linphone_core_uninit(LinphoneCore *lc);
static void linphone_core_zrtp_cache_close(LinphoneCore *lc);
void linphone_core_zrtp_cache_db_init(LinphoneCore *lc, const char *fileName);
#include "Enum.h"
#include "ContactProvider.h"
#include "enum.h"
#include "contact_providers_priv.h"
const char *linphone_core_get_nat_address_resolved(LinphoneCore *lc);
......
......@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "Lpc2Xml.h"
#include "lpc2xml.h"
#include <string.h>
#include <libxml/xmlsave.h>
#include <libxml/xmlversion.h>
......
......@@ -27,7 +27,7 @@
#include "private.h"
#include "bctoolbox/vfs.h"
#include "belle-sip/object.h"
#include "Xml2Lpc.h"
#include "xml2lpc.h"
#include <stdio.h>
#include <stdlib.h>
......@@ -59,7 +59,7 @@
#define lp_new0(type,n) (type*)calloc(sizeof(type),n)
#include "linphone/lpconfig.h"
#include "Lpc2Xml.h"
#include "lpc2xml.h"
typedef struct _LpItem{
char *key;
......
......@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "sal/sal.h"
#include "OfferAnswer.h"
#include "offeranswer.h"
#include "private.h"
static bool_t only_telephone_event(const bctbx_list_t *l){
......
......@@ -33,10 +33,10 @@
#include "linphone/conference.h"
#include "sal/sal.h"
#include "linphone/sipsetup.h"
#include "QualityReporting.h"
#include "quality_reporting.h"
#include "linphone/ringtoneplayer.h"
#include "Vcard.h"
#include "CardDav.h"
#include "vcard_private.h"
#include "carddav.h"
#include "linphone/player.h"
#include "bctoolbox/port.h"
......
......@@ -24,7 +24,7 @@ Copyright (C) 2000 Simon MORLAT (simon.morlat@linphone.org)
#include "linphone/lpconfig.h"
#include "private.h"
#include "mediastreamer2/mediastream.h"
#include "Enum.h"
#include "enum.h"
#include <ctype.h>
/*store current config related to server location*/
......
......@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "private.h"
#include "Xml2Lpc.h"
#include "xml2lpc.h"
#include "linphone/lpconfig.h"
#define XML2LPC_CALLBACK_BUFFER_SIZE 1024
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef SQLITE_STORAGE_ENABLED
#include "private.h"
#include "Sqlite3BctbxVfs.h"
#include "sqlite3_bctbx_vfs.h"
#include <sqlite3.h>
#ifndef _WIN32_WCE
......
......@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "Vcard.h"
#include "vcard_private.h"
#include "belcard/belcard.hpp"
#include "belcard/belcard_parser.hpp"
#include "sal/sal.h"
......
......@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "Xml2Lpc.h"
#include "xml2lpc.h"
#include <string.h>
#include <libxml/xmlreader.h>
......
......@@ -21,7 +21,7 @@
#include "linphone/core.h"
#include "private.h"
#include "liblinphone_tester.h"
#include "Lime.h"
#include "lime.h"
#include "bctoolbox/crypto.h"
#ifdef SQLITE_STORAGE_ENABLED
......
......@@ -23,7 +23,7 @@
#include "liblinphone_tester.h"
#include "CardDav.h"
#include "carddav.h"
#include <time.h>
#define CARDDAV_SERVER "http://dav.linphone.org/card.php/addressbooks/tester/default"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment