mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(windaube): magic-macros is now compatible with windows

Browse source
This commit is contained in:
Ronan Abhamon 2017-09-27 17:47:45 +02:00
parent 6ca6fb6d89
commit 41233811c4
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/linphone/utils/magic-macros.h
View file

@ -36,13 +36,13 @@ LINPHONE_BEGIN_NAMESPACE
A11, A12, A13, A14, A15, A16, N, ... \
) N
#define L_GET_N_ARGS_HELPER(...) L_ARG_N(__VA_ARGS__)
#define L_EXPAND(X) X
#define L_GET_N_ARGS(...) L_GET_N_ARGS_HELPER( \
#define L_GET_N_ARGS(...) L_EXPAND(L_ARG_N( \
__VA_ARGS__, \
16, 15, 14, 13, 12, 11, 10, \
9, 8, 7, 6, 5, 4, 3, 2, 1, 0 \
)
))
// Get argument numbers - 1 from variadic.
#define L_GET_N_ARGS_SUB(X, ...) L_GET_N_ARGS(__VA_ARGS__)
@ -83,8 +83,9 @@ LINPHONE_BEGIN_NAMESPACE
#define L_GET_HEAP_15(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, ...) A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15
#define L_GET_HEAP_16(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, ...) A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16
#define L_GET_HEAP(...) \
L_CONCAT(L_GET_HEAP_, L_GET_N_ARGS_SUB(__VA_ARGS__)) (__VA_ARGS__)
#define L_GET_HEAP(...) L_EXPAND( \
L_CONCAT(L_GET_HEAP_, L_GET_N_ARGS_SUB(__VA_ARGS__)) (__VA_ARGS__) \
)
// Call a macro on args.
#define L_CALL(MACRO, ARGS) MACRO ARGS

2
src/chat/basic-chat-room.h
View file

@ -27,7 +27,7 @@ LINPHONE_BEGIN_NAMESPACE
class BasicChatRoomPrivate;
class BasicChatRoom : public ChatRoom {
class LINPHONE_PUBLIC BasicChatRoom : public ChatRoom {
public:
BasicChatRoom (LinphoneCore *core, const Address &peerAddress);
virtual ~BasicChatRoom () = default;

9
src/chat/chat-room.h
View file

@ -19,11 +19,11 @@
#ifndef _CHAT_ROOM_H_
#define _CHAT_ROOM_H_
#include <list>
// From coreapi
#include "private.h"
#include <list>
#include "address/address.h"
#include "object/object.h"
#include "conference/conference-interface.h"
@ -36,9 +36,9 @@ LINPHONE_BEGIN_NAMESPACE
class ChatRoomPrivate;
class ChatRoom : public Object, public ConferenceInterface {
class LINPHONE_PUBLIC ChatRoom : public Object, public ConferenceInterface {
friend class ChatMessagePrivate;
public:
L_DECLARE_ENUM(State, L_ENUM_VALUES_CHAT_ROOM_STATE);
@ -76,4 +76,3 @@ private:
LINPHONE_END_NAMESPACE
#endif // ifndef _CHAT_ROOM_H_

2
src/chat/client-group-chat-room.h
View file

@ -34,7 +34,7 @@ LINPHONE_BEGIN_NAMESPACE
class ClientGroupChatRoomPrivate;
class ClientGroupChatRoom : public ChatRoom, public RemoteConference {
class LINPHONE_PUBLIC ClientGroupChatRoom : public ChatRoom, public RemoteConference {
public:
ClientGroupChatRoom (LinphoneCore *core, const Address &me, const std::string &subject);
virtual ~ClientGroupChatRoom () = default;

2
src/chat/real-time-text-chat-room.h
View file

@ -32,7 +32,7 @@ LINPHONE_BEGIN_NAMESPACE
class RealTimeTextChatRoomPrivate;
class RealTimeTextChatRoom : public ChatRoom {
class LINPHONE_PUBLIC RealTimeTextChatRoom : public ChatRoom {
public:
RealTimeTextChatRoom (LinphoneCore *core, const Address &peerAddress);
virtual ~RealTimeTextChatRoom () = default;