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

Fix compilation warnings/errors when compiling for Android.

Browse source
This commit is contained in:
Ghislain MARY 2014-10-30 14:59:08 +01:00
parent 636976e55d
commit a2954ef1aa
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/android/Android.mk
View file

@ -266,5 +266,8 @@ LOCAL_MODULE_FILENAME := liblinphone-$(TARGET_ARCH_ABI)
include $(BUILD_SHARED_LIBRARY)
LOCAL_CPPFLAGS=$(LOCAL_CFLAGS)
LOCAL_CFLAGS += -Wdeclaration-after-statement
$(call import-module,android/cpufeatures)

10
coreapi/linphonecore_jni.cc
View file

@ -715,7 +715,6 @@ public:
static void infoReceived(LinphoneCore *lc, LinphoneCall*call, const LinphoneInfoMessage *info){
JNIEnv *env = 0;
jint result = jvm->AttachCurrentThread(&env,NULL);
jobject jcall;
if (result != 0) {
ms_error("cannot attach VM");
return;
@ -4055,7 +4054,7 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_addHeader(
* Signature: (JLjava/lang/String;)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_getHeader(JNIEnv *env, jobject jobj, jlong infoptr, jstring jname){
const char *name=name=env->GetStringUTFChars(jname,NULL);
const char *name=env->GetStringUTFChars(jname,NULL);
const char *ret=linphone_info_message_get_header((LinphoneInfoMessage*)infoptr,name);
env->ReleaseStringUTFChars(jname,name);
return ret ? env->NewStringUTF(ret) : NULL;
@ -4727,6 +4726,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceActivityImpl_setDescriptio
const char *cdescription = description ? env->GetStringUTFChars(description, NULL) : NULL;
linphone_presence_activity_set_description(activity, cdescription);
if (cdescription) env->ReleaseStringUTFChars(description, cdescription);
return (jint)0;
}
/*
@ -4778,6 +4778,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceServiceImpl_setId(JNIEnv *
const char *cid = id ? env->GetStringUTFChars(id, NULL) : NULL;
linphone_presence_service_set_id(service, cid);
if (cid) env->ReleaseStringUTFChars(id, cid);
return (jint)0;
}
/*
@ -4823,6 +4824,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceServiceImpl_setContact(JNI
const char *ccontact = contact ? env->GetStringUTFChars(contact, NULL) : NULL;
linphone_presence_service_set_contact(service, ccontact);
if (ccontact) env->ReleaseStringUTFChars(contact, ccontact);
return (jint)0;
}
/*
@ -4913,6 +4915,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresencePersonImpl_setId(JNIEnv *e
const char *cid = id ? env->GetStringUTFChars(id, NULL) : NULL;
linphone_presence_person_set_id(person, cid);
if (cid) env->ReleaseStringUTFChars(id, cid);
return (jint)0;
}
/*
@ -5085,6 +5088,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceNoteImpl_setContent(JNIEnv
const char *ccontent = content ? env->GetStringUTFChars(content, NULL) : NULL;
linphone_presence_note_set_content(note, ccontent);
if (ccontent) env->ReleaseStringUTFChars(content, ccontent);
return (jint)0;
}
/*
@ -5108,6 +5112,7 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceNoteImpl_setLang(JNIEnv *e
const char *clang = lang ? env->GetStringUTFChars(lang, NULL) : NULL;
linphone_presence_note_set_lang(note, clang);
if (clang) env->ReleaseStringUTFChars(lang, clang);
return (jint)0;
}
/*
@ -5266,7 +5271,6 @@ extern "C" jint Java_org_linphone_core_LinphonePlayerImpl_open(JNIEnv *env, jobj
}
extern "C" jint Java_org_linphone_core_LinphonePlayerImpl_start(JNIEnv *env, jobject jobj, jlong ptr) {
LinphonePlayerData *player_data = (LinphonePlayerData *)((LinphonePlayer *)ptr)->user_data;
return (jint)linphone_player_start((LinphonePlayer *)ptr);
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit 36d8af7faba64c9970e40bf986ae98c3aebcf9c0
Subproject commit 8642a0971455f5bd444e2b84c555848d9981aebc

2
oRTP

@ -1 +1 @@
Subproject commit f1e77dd83f697954e78e024e6c837f32fc70ba5f
Subproject commit 90a19604d061d7f23189feb925847e66d366898e