Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
6735f6e7
Commit
6735f6e7
authored
Feb 01, 2017
by
Ghislain MARY
Browse files
Correct definition of LINPHONE_PUBLIC on Windows.
parent
925da7d7
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
26 additions
and
44 deletions
+26
-44
CMakeLists.txt
CMakeLists.txt
+1
-0
coreapi/lime.h
coreapi/lime.h
+0
-4
coreapi/lpc2xml.h
coreapi/lpc2xml.h
+1
-1
coreapi/vcard_private.h
coreapi/vcard_private.h
+1
-1
coreapi/xml2lpc.h
coreapi/xml2lpc.h
+1
-1
include/linphone/auth_info.h
include/linphone/auth_info.h
+0
-4
include/linphone/call.h
include/linphone/call.h
+0
-3
include/linphone/core.h
include/linphone/core.h
+13
-3
include/linphone/dictionary.h
include/linphone/dictionary.h
+0
-3
include/linphone/error_info.h
include/linphone/error_info.h
+0
-3
include/linphone/im_encryption_engine.h
include/linphone/im_encryption_engine.h
+0
-4
include/linphone/lpconfig.h
include/linphone/lpconfig.h
+0
-4
include/linphone/sipsetup.h
include/linphone/sipsetup.h
+0
-4
include/linphone/vcard.h
include/linphone/vcard.h
+0
-8
include/sal/sal.h
include/sal/sal.h
+9
-1
No files found.
CMakeLists.txt
View file @
6735f6e7
...
...
@@ -237,6 +237,7 @@ if(MSVC)
include_directories
(
${
MSVC_INCLUDE_DIR
}
)
endif
()
add_definitions
(
"-DLINPHONE_EXPORTS"
)
if
(
ENABLE_DEBUG_LOGS
)
add_definitions
(
"-DDEBUG"
)
endif
()
...
...
coreapi/lime.h
View file @
6735f6e7
...
...
@@ -41,10 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/core.h"
#include <mediastreamer2/mscommon.h>
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
/**
* @brief Structure holding all needed material to encrypt/decrypt Messages */
typedef
struct
limeKey_struct
{
...
...
coreapi/lpc2xml.h
View file @
6735f6e7
...
...
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef LPC2XML_H_
#define LPC2XML_H_
#include "linphone/
lpconfig
.h"
#include "linphone/
core
.h"
typedef
struct
_lpc2xml_context
lpc2xml_context
;
...
...
coreapi/vcard_private.h
View file @
6735f6e7
...
...
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef LINPHONE_VCARD_PRIVATE_H
#define LINPHONE_VCARD_PRIVATE_H
#include "linphone/
vcard
.h"
#include "linphone/
core
.h"
#ifdef __cplusplus
extern
"C"
...
...
coreapi/xml2lpc.h
View file @
6735f6e7
...
...
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef XML2LPC_H_
#define XML2LPC_H_
#include "linphone/
lpconfig
.h"
#include "linphone/
core
.h"
typedef
struct
_xml2lpc_context
xml2lpc_context
;
...
...
include/linphone/auth_info.h
View file @
6735f6e7
...
...
@@ -22,10 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <mediastreamer2/mscommon.h>
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
/**
* @addtogroup authentication
* @{
...
...
include/linphone/call.h
View file @
6735f6e7
...
...
@@ -21,9 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define LINPHONE_CALL_H
#include <mediastreamer2/mscommon.h>
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
#include "linphone/address.h"
#include "linphone/call_log.h"
...
...
include/linphone/core.h
View file @
6735f6e7
...
...
@@ -25,20 +25,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "mediastreamer2/msvideo.h"
#include "mediastreamer2/mediastream.h"
#include "mediastreamer2/bitratecontrol.h"
#include "linphone/sipsetup.h"
#include "linphone/lpconfig.h"
#define LINPHONE_IPADDR_SIZE 64
#define LINPHONE_HOSTNAME_SIZE 128
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#if defined(_MSC_VER)
#ifdef LINPHONE_EXPORTS
#define LINPHONE_PUBLIC __declspec(dllexport)
#else
#define LINPHONE_PUBLIC __declspec(dllimport)
#endif
#else
#define LINPHONE_PUBLIC
#endif
#endif
#ifndef LINPHONE_DEPRECATED
#define LINPHONE_DEPRECATED MS2_DEPRECATED
#endif
#include "linphone/sipsetup.h"
#include "linphone/lpconfig.h"
#ifdef __cplusplus
extern
"C"
{
...
...
include/linphone/dictionary.h
View file @
6735f6e7
...
...
@@ -21,9 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define LINPHONE_DICTIONARY_H
#include <mediastreamer2/mscommon.h>
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
typedef
struct
belle_sip_dict
LinphoneDictionary
;
...
...
include/linphone/error_info.h
View file @
6735f6e7
...
...
@@ -21,9 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define LINPHONE_ERROR_INFO_H
#include <mediastreamer2/mscommon.h>
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
/**
* @addtogroup misc
...
...
include/linphone/im_encryption_engine.h
View file @
6735f6e7
...
...
@@ -22,10 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <mediastreamer2/mscommon.h>
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
/**
* @addtogroup misc
* @{
...
...
include/linphone/lpconfig.h
View file @
6735f6e7
...
...
@@ -29,10 +29,6 @@
#include <ortp/port.h>
#include "linphone/dictionary.h"
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
/**
* @addtogroup misc
* @{
...
...
include/linphone/sipsetup.h
View file @
6735f6e7
...
...
@@ -23,10 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "mediastreamer2/mscommon.h"
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
struct
_SipSetup
;
struct
_BuddyInfo
;
...
...
include/linphone/vcard.h
View file @
6735f6e7
...
...
@@ -22,14 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <mediastreamer2/mscommon.h>
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
#ifndef LINPHONE_DEPRECATED
#define LINPHONE_DEPRECATED MS2_DEPRECATED
#endif
#ifdef __cplusplus
extern
"C"
{
...
...
include/sal/sal.h
View file @
6735f6e7
...
...
@@ -36,7 +36,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "belle-sip/mainloop.h"
#ifndef LINPHONE_PUBLIC
#define LINPHONE_PUBLIC MS2_PUBLIC
#if defined(_MSC_VER)
#ifdef LINPHONE_EXPORTS
#define LINPHONE_PUBLIC __declspec(dllexport)
#else
#define LINPHONE_PUBLIC __declspec(dllimport)
#endif
#else
#define LINPHONE_PUBLIC
#endif
#endif
#ifdef __cplusplus
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment