From 8a3216cb995960b87a17fe2d5eee811bb0852979 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 20 Feb 2021 08:46:14 +1100 Subject: [PATCH] less warnings compiling android build --- misc/buildbot.sh | 2 +- src/Http.c | 2 +- src/Platform.c | 2 +- src/Platform.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/buildbot.sh b/misc/buildbot.sh index 3e9187630..f0319088f 100644 --- a/misc/buildbot.sh +++ b/misc/buildbot.sh @@ -160,7 +160,7 @@ build_android() { cp obj/cc-unsigned.apk obj/cc-signed.apk jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore debug.keystore -storepass android -keypass android obj/cc-signed.apk androiddebugkey # create aligned .apk file - $TOOLS_ROOT/zipalign -f -v 4 obj/cc-signed.apk $ROOT_DIR/src/cc.apk + $TOOLS_ROOT/zipalign -f 4 obj/cc-signed.apk $ROOT_DIR/src/cc.apk } # ----------------------------- driver diff --git a/src/Http.c b/src/Http.c index 63067f4e5..4da837376 100644 --- a/src/Http.c +++ b/src/Http.c @@ -909,7 +909,7 @@ static void JNICALL java_HttpAppendData(JNIEnv* env, jobject o, jbyteArray arr, if (!req->_capacity) Http_BufferInit(req); Http_BufferEnsure(req, len); - (*env)->GetByteArrayRegion(env, arr, 0, len, &req->data[req->size]); + (*env)->GetByteArrayRegion(env, arr, 0, len, (jbyte*)(&req->data[req->size])); Http_BufferExpanded(req, len); } diff --git a/src/Platform.c b/src/Platform.c index d8ea8b51a..0a932f0ac 100644 --- a/src/Platform.c +++ b/src/Platform.c @@ -2158,7 +2158,7 @@ jobject JavaMakeString(JNIEnv* env, const cc_string* str) { return (*env)->NewStringUTF(env, (const char*)tmp); } -jbyteArray JavaMakeBytes(JNIEnv* env, const cc_uint8* src, cc_uint32 len) { +jbyteArray JavaMakeBytes(JNIEnv* env, const void* src, cc_uint32 len) { if (!len) return NULL; jbyteArray arr = (*env)->NewByteArray(env, len); (*env)->SetByteArrayRegion(env, arr, 0, len, src); diff --git a/src/Platform.h b/src/Platform.h index 914c1a4be..b3eedcc32 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -253,7 +253,7 @@ cc_string JavaGetString(JNIEnv* env, jstring str, char* buffer); /* Allocates a java string from the given string. */ jobject JavaMakeString(JNIEnv* env, const cc_string* str); /* Allocates a java byte array from the given block of memory. */ -jbyteArray JavaMakeBytes(JNIEnv* env, const cc_uint8* src, cc_uint32 len); +jbyteArray JavaMakeBytes(JNIEnv* env, const void* src, cc_uint32 len); /* Calls a method in the activity class that returns nothing. */ void JavaCallVoid(JNIEnv* env, const char* name, const char* sig, jvalue* args); /* Calls a method in the activity class that returns a jint. */