From: drh <drh@noemail.net>
Date: Mon, 11 Apr 2011 18:35:09 +0000 (+0000)
Subject: Do not override the fchmod system call in unix unless the
X-Git-Tag: version-3.7.6~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6c47493ee544aa43342e75c137ab71f1c1bf1b2;p=thirdparty%2Fsqlite.git

Do not override the fchmod system call in unix unless the
SQLITE_ENABLE_LOCKING_STYLE compile-time option is engaged.

FossilOrigin-Name: 51029d8430d2dbc782f161577d47e3dd11c4e4d7
---

diff --git a/manifest b/manifest
index 09cdbe394a..7ce45cc5d9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sthe\sOS/2\spatches.\s\sThis\schange\salso\smove\sthe\slocation\sof\sa\sglobal\nvariable\sdeclaration\sin\sshell.c\swhich\smight\seffect\sother\sbuild\stargets.
-D 2011-04-11T15:36:26.429
+C Do\snot\soverride\sthe\sfchmod\ssystem\scall\sin\sunix\sunless\sthe\nSQLITE_ENABLE_LOCKING_STYLE\scompile-time\soption\sis\sengaged.
+D 2011-04-11T18:35:09.989
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c a8fe62148d41e54e383d3360a711a01595feef58
+F src/os_unix.c 9541fdb1be90845271184e7ac45d22565e37eb3b
 F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
 F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@@ -929,7 +929,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f18f5f5893a0d37ecedcfcfdddbe06cdbe0b4243
-R c8181928c3ceb1c71c7c8d428b56d445
+P 73906b67dc920e0c36e68ef9a302be3b495e8e3a
+R fcc945afeae11beaa1721b47d44a80b4
 U drh
-Z e89a36f6abc00bf0be3e1bd386e9919f
+Z b0bb59b252b4e1710f281b3588ea494e
diff --git a/manifest.uuid b/manifest.uuid
index 525dc9dae3..c317e4e1bb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73906b67dc920e0c36e68ef9a302be3b495e8e3a
\ No newline at end of file
+51029d8430d2dbc782f161577d47e3dd11c4e4d7
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index e3fa9ea465..f0e8258f14 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -363,8 +363,10 @@ static struct unix_syscall {
 #define osPwrite64  ((ssize_t(*)(int,const void*,size_t,off_t))\
                     aSyscall[13].pCurrent)
 
+#if SQLITE_ENABLE_LOCKING_STYLE
   { "fchmod",       (sqlite3_syscall_ptr)fchmod,     0  },
 #define osFchmod    ((int(*)(int,mode_t))aSyscall[14].pCurrent)
+#endif
 
 #if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE
   { "fallocate",    (sqlite3_syscall_ptr)posix_fallocate,  0 },