From: drh <drh@noemail.net>
Date: Sun, 17 Apr 2011 17:14:03 +0000 (+0000)
Subject: Change the prototype for the open() system call to agree with Posix.
X-Git-Tag: version-3.7.6.2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d5655ada125900cb8544e0bd16b8400894adc80;p=thirdparty%2Fsqlite.git

Change the prototype for the open() system call to agree with Posix.
Though a faulty function prototype in a pointer cast is a seemingly innocuous
error, the correct prototype is necessary for pthreads to work correctly
on NetBSD.

FossilOrigin-Name: 986f2f25baf21d0d6a4b3749e5ea76502d26536e
---

diff --git a/manifest b/manifest
index 9d9119efef..e9fde1070c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.7.6.1
-D 2011-04-13T14:40:25.366
+C Change\sthe\sprototype\sfor\sthe\sopen()\ssystem\scall\sto\sagree\swith\sPosix.\s\nThough\sa\sfaulty\sfunction\sprototype\sin\sa\spointer\scast\sis\sa\sseemingly\sinnocuous\nerror,\sthe\scorrect\sprototype\sis\snecessary\sfor\spthreads\sto\swork\scorrectly\non\sNetBSD.
+D 2011-04-17T17:14:03.504
 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 b2d4cd9976bbcc798f33746d3fab12b3ea57ffa9
+F src/os_unix.c 4389231d079f8e323d9e24db6658bfd31f6d27a2
 F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
 F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@@ -929,7 +929,11 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5f0c394a5ab308946e72f20d6351c08c6737c63f
-R 7fdf1bc9f85c04d95a52ad8e53811995
+P a35e83eac7b185f4d363d7fa51677f2fdfa27695
+R 96e26e852f391396caf345acff2553d0
+T *bgcolor * #80bbd6
+T *branch * branch-3.7.6
+T *sym-branch-3.7.6 *
+T -sym-trunk *
 U drh
-Z 0a32cef0eaf644f20ba71a7034d19246
+Z 7050e8c404d8caa4f2c84e7a6416c670
diff --git a/manifest.uuid b/manifest.uuid
index 99bc59a369..251588d5a3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a35e83eac7b185f4d363d7fa51677f2fdfa27695
\ No newline at end of file
+986f2f25baf21d0d6a4b3749e5ea76502d26536e
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 744d857767..2626ab4d32 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -293,7 +293,7 @@ static struct unix_syscall {
   sqlite3_syscall_ptr pDefault; /* Default value */
 } aSyscall[] = {
   { "open",         (sqlite3_syscall_ptr)open,       0  },
-#define osOpen      ((int(*)(const char*,int,int))aSyscall[0].pCurrent)
+#define osOpen      ((int(*)(const char*,int,...))aSyscall[0].pCurrent)
 
   { "close",        (sqlite3_syscall_ptr)close,      0  },
 #define osClose     ((int(*)(int))aSyscall[1].pCurrent)