Adjustments due to warnings after switching NDK to r15c from r11c

Author: developernotes

android-database-sqlcipher/src/main/cpp/net_sqlcipher_CursorWindow.cpp

@@ -283,7 +283,7 @@ namespace sqlcipher {
       int64_t value;
       if (window->getLong(row, column, &value)) {
         char buf[32];
-        snprintf(buf, sizeof(buf), "%lld", value);
+        snprintf(buf, sizeof(buf), "%"PRId64"", value);
         return env->NewStringUTF((const char*)buf);
       }
       return NULL;
@@ -294,8 +294,8 @@ namespace sqlcipher {
         snprintf(buf, sizeof(buf), "%g", value);
         return env->NewStringUTF(buf);
       }
-      return NULL;
     }
+    return NULL;
   }
 
   /**
@@ -359,7 +359,7 @@ namespace sqlcipher {
       if (window->getLong(row, column, &value)) {
         int len;
         char buf[32];
-        len = snprintf(buf, sizeof(buf), "%lld", value);
+        len = snprintf(buf, sizeof(buf), "%"PRId64"", value);
         jint bufferLength = env->GetArrayLength(buffer);
         if(len > bufferLength || dst == NULL){
           jstring content = env->NewStringUTF(buf);

android-database-sqlcipher/src/main/cpp/net_sqlcipher_database_SQLiteCompiledSql.cpp

@@ -24,6 +24,7 @@
 
 #include <sqlite3.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "log.h"

android-database-sqlcipher/src/main/cpp/net_sqlcipher_database_SQLiteDatabase.cpp

@@ -21,6 +21,7 @@
 #include <sqlite3.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>