diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /build/android/patches/sqlite3-readonly-fix.patch | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'build/android/patches/sqlite3-readonly-fix.patch')
| -rw-r--r-- | build/android/patches/sqlite3-readonly-fix.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/build/android/patches/sqlite3-readonly-fix.patch b/build/android/patches/sqlite3-readonly-fix.patch deleted file mode 100644 index be19055ee..000000000 --- a/build/android/patches/sqlite3-readonly-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 - }; |