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

No longer include a userData field in the C clonable structs.

Browse source
This commit is contained in:
Ghislain MARY 2017-09-15 12:03:18 +02:00
parent 77397eab83
commit b3d8680150
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/c-wrapper/api/c-call-params.cpp
View file

@ -492,12 +492,12 @@ void linphone_call_params_set_no_user_consent(LinphoneCallParams *params, bool_t
* Reference and user data handling functions *
******************************************************************************/
void *linphone_call_params_get_user_data(const LinphoneCallParams *cp) {
return cp->userData;
void * linphone_call_params_get_user_data(const LinphoneCallParams *cp) {
return L_GET_USER_DATA_FROM_C_STRUCT(cp, MediaSessionParams, CallParams);
}
void linphone_call_params_set_user_data(LinphoneCallParams *cp, void *ud) {
cp->userData = ud;
L_SET_USER_DATA_FROM_C_STRUCT(cp, ud, MediaSessionParams, CallParams);
}
LinphoneCallParams * linphone_call_params_ref(LinphoneCallParams *cp) {

2
src/c-wrapper/c-tools.h
View file

@ -42,7 +42,6 @@ private:
template<typename T>
struct WrappedClonableObject {
belle_sip_object_t base;
void *userData;
T *cppPtr;
};
@ -271,7 +270,6 @@ LINPHONE_END_NAMESPACE
#define L_DECLARE_C_CLONABLE_STRUCT_IMPL(CPP_CLASS, C_STRUCT, C_NAME, ...) \
struct _Linphone ## C_STRUCT { \
belle_sip_object_t base; \
void *userData; \
LINPHONE_NAMESPACE::CPP_CLASS *cppPtr; \
__VA_ARGS__ \
}; \