summaryrefslogtreecommitdiff
path: root/build/android/patches
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2016-12-22 23:16:00 +0100
committerest31 <MTest31@outlook.com>2016-12-22 23:16:00 +0100
commit81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (patch)
tree1e9ef1be1b3295a8673d6e4f0bdeb4c2d3a6015f /build/android/patches
parent8077612dcb48221281e726a60eb97bf73fde462b (diff)
parent231ac33d34dfaaddf292c5f31b1eae43eeefba2d (diff)
downloadminetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.gz
minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.bz2
minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.zip
Merge 0.4.15 changes into stable-0.4
0.4.15 release!
Diffstat (limited to 'build/android/patches')
-rw-r--r--build/android/patches/sqlite3-readonly-fix.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/build/android/patches/sqlite3-readonly-fix.patch b/build/android/patches/sqlite3-readonly-fix.patch
new file mode 100644
index 000000000..be19055ee
--- /dev/null
+++ b/build/android/patches/sqlite3-readonly-fix.patch
@@ -0,0 +1,17 @@
+--- sqlite3.c 2016-11-29 02:29:24.000000000 +0000
++++ sqlite3.c 2016-12-08 22:54:54.206465377 +0000
+@@ -30445,7 +30445,14 @@
+ #if OS_VXWORKS
+ struct vxworksFileId *pId; /* Unique file ID for vxworks. */
+ #else
+- ino_t ino; /* Inode number */
++ #ifdef ANDROID
++ // Bionic's struct stat has a 64 bit st_ino on both 32 and
++ // 64 bit architectures. ino_t remains 32 bits wide on 32 bit
++ // architectures and can lead to inode truncation.
++ unsigned long long ino; /* Inode number */
++ #else
++ ino_t ino; /* Inode number */
++ #endif
+ #endif
+ };