mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 12:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev_vcard

Browse source
This commit is contained in:
Sylvain Berfini 2016-01-08 11:14:58 +01:00
commit 28c8807ba5
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coreapi/conference.h
View file

@ -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

17
coreapi/private.h
View file

@ -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;
@ -1297,11 +1303,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

7
include/sal/sal.h
View file

@ -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