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
bcf55b64
Commit
bcf55b64
authored
Jan 08, 2016
by
Sylvain Berfini
🐮
Browse files
Fix extern C issue
parent
dab5cc72
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
8 deletions
+24
-8
coreapi/conference.h
coreapi/conference.h
+8
-0
coreapi/private.h
coreapi/private.h
+9
-8
include/sal/sal.h
include/sal/sal.h
+7
-0
No files found.
coreapi/conference.h
View file @
bcf55b64
...
...
@@ -26,6 +26,10 @@
#ifndef CONFERENCE_H
#define CONFERENCE_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include "linphonecore.h"
//typedef struct _LinphoneConference LinphoneConference;
...
...
@@ -65,4 +69,8 @@ void linphone_conference_on_call_terminating(LinphoneConference *obj, LinphoneCa
bool_t
linphone_conference_check_class
(
LinphoneConference
*
obj
,
LinphoneConferenceClass
_class
);
#ifdef __cplusplus
}
#endif
#endif // CONFERENCE_H
coreapi/private.h
View file @
bcf55b64
...
...
@@ -24,10 +24,7 @@
#ifndef _PRIVATE_H
#define _PRIVATE_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include "linphonecore.h"
#include "linphonefriend.h"
#include "friendlist.h"
...
...
@@ -119,6 +116,15 @@ extern "C" {
#endif
#endif
#include <libxml/xmlreader.h>
#include <libxml/xmlwriter.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
#ifdef __cplusplus
extern
"C"
{
#endif
struct
_LinphoneCallParams
{
belle_sip_object_t
base
;
void
*
user_data
;
...
...
@@ -1237,11 +1243,6 @@ void _linphone_player_destroy(LinphonePlayer *player);
* XML UTILITY FUNCTIONS *
****************************************************************************/
#include <libxml/xmlreader.h>
#include <libxml/xmlwriter.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
#define XMLPARSING_BUFFER_LEN 2048
#define MAX_XPATH_LENGTH 256
...
...
include/sal/sal.h
View file @
bcf55b64
...
...
@@ -38,6 +38,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define LINPHONE_PUBLIC MS2_PUBLIC
#endif
#ifdef __cplusplus
extern
"C"
{
#endif
/*Dirty hack, keep in sync with mediastreamer2/include/mediastream.h */
#ifndef PAYLOAD_TYPE_FLAG_CAN_RECV
#define PAYLOAD_TYPE_FLAG_CAN_RECV PAYLOAD_TYPE_USER_FLAG_1
...
...
@@ -883,6 +887,9 @@ void sal_set_http_proxy_port(Sal *sal, int port) ;
const
char
*
sal_get_http_proxy_host
(
const
Sal
*
sal
);
int
sal_get_http_proxy_port
(
const
Sal
*
sal
);
#ifdef __cplusplus
}
#endif
#endif
...
...
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