From 7d7a83d478dbf4a4343a3fe2b36c0ea653092af9 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 23 Nov 2015 14:33:29 +0100 Subject: [PATCH] Fix build for Windows 10. --- .../windows10/liblinphone/liblinphone.vcxproj | 1 + coreapi/linphonecore.h | 52 +++++++++---------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/build/windows10/liblinphone/liblinphone.vcxproj b/build/windows10/liblinphone/liblinphone.vcxproj index 3b25ffae7..b5922519b 100644 --- a/build/windows10/liblinphone/liblinphone.vcxproj +++ b/build/windows10/liblinphone/liblinphone.vcxproj @@ -172,6 +172,7 @@ false $(SolutionDir)$(Platform)\$(Configuration)\include;$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\coreapi;$(ProjectDir)..\..\..\mediastreamer2\include;$(ProjectDir)..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\oRTP\include;$(ProjectDir)..\..\..\..\sqlite;$(ProjectDir)..\..\..\..\zlib;%(AdditionalIncludeDirectories) HAVE_CONFIG_H;HAVE_ZLIB;MSG_STORAGE_ENABLED;VIDEO_ENABLED;IN_LINPHONE;LINPHONE_PLUGINS_DIR="\\linphone\\plugins";_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + 4996 Console diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 3e24e7f74..226b101bc 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -886,7 +886,7 @@ LINPHONE_PUBLIC void linphone_call_set_native_video_window_id(LinphoneCall *call * @deprecated Use linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call)) instead. * @ingroup call_control */ -LINPHONE_PUBLIC bool_t linphone_call_is_in_conference(const LinphoneCall *call) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED bool_t linphone_call_is_in_conference(const LinphoneCall *call); /** * Enables or disable echo cancellation for this call * @param call @@ -1231,7 +1231,7 @@ typedef enum _LinphoneChatMessageState { * @param ud application user data * @deprecated */ -typedef void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud) LINPHONE_DEPRECATED; +typedef LINPHONE_DEPRECATED void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud); /** * Call back used to notify message delivery status @@ -1315,7 +1315,7 @@ LINPHONE_PUBLIC bool_t linphone_core_chat_enabled(const LinphoneCore *lc); * @param cr #LinphoneChatRoom object * @deprecated Use linphone_chat_room_unref() instead. */ -LINPHONE_PUBLIC void linphone_chat_room_destroy(LinphoneChatRoom *cr) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_chat_room_destroy(LinphoneChatRoom *cr); /** * Create a message attached to a dedicated chat room; * @param cr the chat room. @@ -1379,7 +1379,7 @@ LINPHONE_PUBLIC const LinphoneAddress* linphone_chat_room_get_peer_address(Linph * @param cr #LinphoneChatRoom object * @param msg message to be sent */ -LINPHONE_PUBLIC void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg); /** * Send a message to peer member of this chat room. * @param cr #LinphoneChatRoom object @@ -1390,7 +1390,7 @@ LINPHONE_PUBLIC void linphone_chat_room_send_message(LinphoneChatRoom *cr, const * @note The LinphoneChatMessage must not be destroyed until the the callback is called. * The LinphoneChatMessage reference is transfered to the function and thus doesn't need to be unref'd by the application. */ -LINPHONE_PUBLIC void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangedCb status_cb,void* ud) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangedCb status_cb,void* ud); /** * Send a message to peer member of this chat room. * @param[in] cr LinphoneChatRoom object @@ -1465,7 +1465,7 @@ LINPHONE_PUBLIC int linphone_chat_room_get_unread_messages_count(LinphoneChatRoo * Returns back pointer to LinphoneCore object. * @deprecated use linphone_chat_room_get_core() **/ -LINPHONE_PUBLIC LinphoneCore* linphone_chat_room_get_lc(LinphoneChatRoom *cr) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneCore* linphone_chat_room_get_lc(LinphoneChatRoom *cr); /** * Returns back pointer to LinphoneCore object. **/ @@ -1574,7 +1574,7 @@ LINPHONE_PUBLIC const LinphoneContent* linphone_chat_message_get_file_transfer_i * @param status_cb LinphoneChatMessageStateChangeCb status callback invoked when file is downloaded or could not be downloaded * @deprecated Use linphone_chat_message_download_file() instead. */ -LINPHONE_PUBLIC void linphone_chat_message_start_file_download(LinphoneChatMessage* message, LinphoneChatMessageStateChangedCb status_cb, void* ud) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_chat_message_start_file_download(LinphoneChatMessage* message, LinphoneChatMessageStateChangedCb status_cb, void* ud); /** * Start the download of the file referenced in a LinphoneChatMessage from remote server. * @param[in] message LinphoneChatMessage object. @@ -2070,15 +2070,15 @@ typedef struct _LinphoneCoreVTable{ LinphoneCoreNotifyReceivedCb notify_received; /**< Notifies a an event notification, see linphone_core_subscribe() */ LinphoneCorePublishStateChangedCb publish_state_changed;/**Notifies publish state change (only from #LinphoneEvent api)*/ LinphoneCoreConfiguringStatusCb configuring_status; /** Notifies configuring status changes */ - DisplayStatusCb display_status LINPHONE_DEPRECATED; /**< @deprecated Callback that notifies various events with human readable text.*/ - DisplayMessageCb display_message LINPHONE_DEPRECATED;/**< @deprecated Callback to display a message to the user */ - DisplayMessageCb display_warning LINPHONE_DEPRECATED;/**< @deprecated Callback to display a warning to the user */ - DisplayUrlCb display_url LINPHONE_DEPRECATED; /**< @deprecated */ - ShowInterfaceCb show LINPHONE_DEPRECATED; /**< @deprecated Notifies the application that it should show up*/ - LinphoneCoreTextMessageReceivedCb text_received LINPHONE_DEPRECATED; /**< @deprecated, use #message_received instead
A text message has been received */ - LinphoneCoreFileTransferRecvCb file_transfer_recv LINPHONE_DEPRECATED; /**< @deprecated Callback to store file received attached to a #LinphoneChatMessage */ - LinphoneCoreFileTransferSendCb file_transfer_send LINPHONE_DEPRECATED; /**< @deprecated Callback to collect file chunk to be sent for a #LinphoneChatMessage */ - LinphoneCoreFileTransferProgressIndicationCb file_transfer_progress_indication LINPHONE_DEPRECATED; /**< @deprecated Callback to indicate file transfer progress */ + LINPHONE_DEPRECATED DisplayStatusCb display_status; /**< @deprecated Callback that notifies various events with human readable text.*/ + LINPHONE_DEPRECATED DisplayMessageCb display_message;/**< @deprecated Callback to display a message to the user */ + LINPHONE_DEPRECATED DisplayMessageCb display_warning;/**< @deprecated Callback to display a warning to the user */ + LINPHONE_DEPRECATED DisplayUrlCb display_url; /**< @deprecated */ + LINPHONE_DEPRECATED ShowInterfaceCb show; /**< @deprecated Notifies the application that it should show up*/ + LINPHONE_DEPRECATED LinphoneCoreTextMessageReceivedCb text_received; /**< @deprecated, use #message_received instead
A text message has been received */ + LINPHONE_DEPRECATED LinphoneCoreFileTransferRecvCb file_transfer_recv; /**< @deprecated Callback to store file received attached to a #LinphoneChatMessage */ + LINPHONE_DEPRECATED LinphoneCoreFileTransferSendCb file_transfer_send; /**< @deprecated Callback to collect file chunk to be sent for a #LinphoneChatMessage */ + LINPHONE_DEPRECATED LinphoneCoreFileTransferProgressIndicationCb file_transfer_progress_indication; /**< @deprecated Callback to indicate file transfer progress */ LinphoneCoreNetworkReachableCb network_reachable; /**< Callback to report IP network status (I.E up/down )*/ LinphoneCoreLogCollectionUploadStateChangedCb log_collection_upload_state_changed; /**< Callback to upload collected logs */ LinphoneCoreLogCollectionUploadProgressIndicationCb log_collection_upload_progress_indication; /**< Callback to indicate log collection upload progress */ @@ -2304,11 +2304,11 @@ LINPHONE_PUBLIC const char *linphone_core_get_user_agent(LinphoneCore *lc); /** * @deprecated Use #linphone_core_get_user_agent instead. **/ -LINPHONE_PUBLIC const char *linphone_core_get_user_agent_name(void) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED const char *linphone_core_get_user_agent_name(void); /** * @deprecated Use #linphone_core_get_user_agent instead. **/ -LINPHONE_PUBLIC const char *linphone_core_get_user_agent_version(void) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED const char *linphone_core_get_user_agent_version(void); /** * Instanciates a LinphoneCore object. @@ -2374,7 +2374,7 @@ LINPHONE_PUBLIC void linphone_core_remove_listener(LinphoneCore *lc, const Linph LINPHONE_PUBLIC void linphone_core_set_user_agent(LinphoneCore *lc, const char *ua_name, const char *version); /** @deprecated Use linphone_proxy_config_normalize_sip_uri instead. */ -LINPHONE_PUBLIC LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url); LINPHONE_PUBLIC LinphoneCall * linphone_core_invite(LinphoneCore *lc, const char *url); @@ -2481,7 +2481,7 @@ LINPHONE_PUBLIC LinphoneCall *linphone_core_get_call_by_remote_address2(Linphone * @param dtmf The dtmf name specified as a char, such as '0', '#' etc... * **/ -LINPHONE_PUBLIC void linphone_core_send_dtmf(LinphoneCore *lc,char dtmf) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_core_send_dtmf(LinphoneCore *lc,char dtmf); /** * Sets the local "from" identity. @@ -2854,7 +2854,7 @@ LINPHONE_PUBLIC void linphone_core_set_default_proxy_index(LinphoneCore *lc, int * @return the default proxy configuration, that is the one used to determine the current identity. * @deprecated Use linphone_core_get_default_proxy_config() instead. **/ -LINPHONE_PUBLIC int linphone_core_get_default_proxy(LinphoneCore *lc, LinphoneProxyConfig **config) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED int linphone_core_get_default_proxy(LinphoneCore *lc, LinphoneProxyConfig **config); /** * @return the default proxy configuration, that is the one used to determine the current identity. @@ -3215,13 +3215,13 @@ bool_t linphone_core_agc_enabled(const LinphoneCore *lc); /** * @deprecated Use #linphone_core_enable_mic instead. **/ -LINPHONE_PUBLIC void linphone_core_mute_mic(LinphoneCore *lc, bool_t muted) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_core_mute_mic(LinphoneCore *lc, bool_t muted); /** * Get mic state. * @deprecated Use #linphone_core_mic_enabled instead **/ -LINPHONE_PUBLIC bool_t linphone_core_is_mic_muted(LinphoneCore *lc) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED bool_t linphone_core_is_mic_muted(LinphoneCore *lc); /** * Enable or disable the microphone. @@ -3349,14 +3349,14 @@ LINPHONE_PUBLIC bool_t linphone_core_video_supported(LinphoneCore *lc); * @ingroup media_parameters * @deprecated Use #linphone_core_enable_video_capture and #linphone_core_enable_video_display instead. **/ -LINPHONE_PUBLIC void linphone_core_enable_video(LinphoneCore *lc, bool_t vcap_enabled, bool_t display_enabled) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_core_enable_video(LinphoneCore *lc, bool_t vcap_enabled, bool_t display_enabled); /** * Returns TRUE if video is enabled, FALSE otherwise. * @ingroup media_parameters * @deprecated Use #linphone_core_video_capture_enabled and #linphone_core_video_display_enabled instead. **/ -LINPHONE_PUBLIC bool_t linphone_core_video_enabled(LinphoneCore *lc) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED bool_t linphone_core_video_enabled(LinphoneCore *lc); /** * Enable or disable video capture. @@ -4232,7 +4232,7 @@ LINPHONE_PUBLIC LinphoneTransportType linphone_transport_parse(const char* trans * @return LinphoneCallParams * @deprecated use linphone_core_create_call_params() */ -LINPHONE_PUBLIC LinphoneCallParams *linphone_core_create_default_call_parameters(LinphoneCore *lc) LINPHONE_DEPRECATED; +LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneCallParams *linphone_core_create_default_call_parameters(LinphoneCore *lc); #ifdef __cplusplus