Commit 67dbc2eb authored by Sylvain Berfini's avatar Sylvain Berfini 🎩 Committed by Nicolas Michon

Fix rebase errors

parent 245cf4f3
......@@ -431,7 +431,6 @@ extern "C" JNIEXPORT void JNICALL Java_org_linphone_core_tools_AndroidPlatformHe
androidPlatformHelper->setNetworkReachable(reachable);
};
androidPlatformHelper->getCore()->doLater(fun);
}
extern "C" JNIEXPORT void JNICALL Java_org_linphone_core_tools_AndroidPlatformHelper_setHttpProxy(JNIEnv* env, jobject thiz, jlong ptr, jstring host, jint port) {
......
......@@ -29,7 +29,7 @@ using namespace std;
LINPHONE_BEGIN_NAMESPACE
GenericPlatformHelpers::GenericPlatformHelpers (LinphoneCore *lc) : PlatformHelpers(lc), mMonitorTimer(nullptr) {}
GenericPlatformHelpers::GenericPlatformHelpers (std::shared_ptr<LinphonePrivate::Core> core) : PlatformHelpers(core), mMonitorTimer(nullptr) {}
GenericPlatformHelpers::~GenericPlatformHelpers () {
if (mMonitorTimer) {
......@@ -141,7 +141,7 @@ void GenericPlatformHelpers::onLinphoneCoreStop () {}
int GenericPlatformHelpers::monitorTimerExpired (void *data, unsigned int revents) {
GenericPlatformHelpers *helper = static_cast<GenericPlatformHelpers *>(data);
LinphoneCore *core = helper->getCore();
LinphoneCore *core = helper->getCore()->getCCore();
char newIp[LINPHONE_IPADDR_SIZE];
linphone_core_get_local_ip(core, AF_UNSPEC, nullptr, newIp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment