From c0af01b2e0e008e17201d73a66bd860365d8b788 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 23 May 2018 16:49:35 +0200 Subject: [PATCH] fix(core): export some symbols for Windows --- src/conference/handlers/remote-conference-event-handler.h | 3 ++- src/conference/local-conference.h | 2 +- src/conference/params/call-session-params.h | 2 +- src/content/content-manager.h | 5 +++-- src/sal/sal.cpp | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/conference/handlers/remote-conference-event-handler.h b/src/conference/handlers/remote-conference-event-handler.h index 550ffeff1..f1d13db6e 100644 --- a/src/conference/handlers/remote-conference-event-handler.h +++ b/src/conference/handlers/remote-conference-event-handler.h @@ -30,8 +30,9 @@ class ChatRoomId; class RemoteConference; class RemoteConferenceEventHandlerPrivate; -class RemoteConferenceEventHandler : public Object { +class LINPHONE_PUBLIC RemoteConferenceEventHandler : public Object { friend class ClientGroupChatRoom; + public: RemoteConferenceEventHandler (RemoteConference *remoteConference); ~RemoteConferenceEventHandler (); diff --git a/src/conference/local-conference.h b/src/conference/local-conference.h index d926ecf54..31942e241 100644 --- a/src/conference/local-conference.h +++ b/src/conference/local-conference.h @@ -28,7 +28,7 @@ LINPHONE_BEGIN_NAMESPACE class LocalConferencePrivate; -class LocalConference : public Conference { +class LINPHONE_PUBLIC LocalConference : public Conference { friend class ServerGroupChatRoomPrivate; public: diff --git a/src/conference/params/call-session-params.h b/src/conference/params/call-session-params.h index 687b77b17..986c53216 100644 --- a/src/conference/params/call-session-params.h +++ b/src/conference/params/call-session-params.h @@ -33,7 +33,7 @@ LINPHONE_BEGIN_NAMESPACE class CallSessionParamsPrivate; class Core; -class CallSessionParams : public ClonableObject { +class LINPHONE_PUBLIC CallSessionParams : public ClonableObject { friend class CallSession; friend class CallSessionPrivate; friend class ClientGroupChatRoom; diff --git a/src/content/content-manager.h b/src/content/content-manager.h index d44c9c3ad..deeb62f57 100644 --- a/src/content/content-manager.h +++ b/src/content/content-manager.h @@ -33,9 +33,10 @@ class Content; namespace { constexpr const char MultipartBoundary[] = "---------------------------14737809831466499882746641449"; } + namespace ContentManager { - std::list multipartToContentList (const Content &content); - Content contentListToMultipart (const std::list &contents, const std::string &boundary = MultipartBoundary); + LINPHONE_PUBLIC std::list multipartToContentList (const Content &content); + LINPHONE_PUBLIC Content contentListToMultipart (const std::list &contents, const std::string &boundary = MultipartBoundary); } LINPHONE_END_NAMESPACE diff --git a/src/sal/sal.cpp b/src/sal/sal.cpp index ac3db4c15..742d7defe 100644 --- a/src/sal/sal.cpp +++ b/src/sal/sal.cpp @@ -226,12 +226,12 @@ void Sal::processRequestEventCb (void *ud, const belle_sip_request_event_t *even /*It is worth noting that proxies can (and will) remove this header field*/ op->setPrivacyFromMessage((belle_sip_message_t*)req); - + if (strcmp("ACK",method) != 0){ /*The ACK custom header is processed specifically later on*/ op->assignRecvHeaders((belle_sip_message_t*)req); } - + if (op->mCallbacks && op->mCallbacks->process_request_event) { op->mCallbacks->process_request_event(op,event); } else {