Fix a missing forward declaration that is needed when

SQLITE_PREFER_PROXY_LOCKING is defined. (CVS 5972)

FossilOrigin-Name: 24235300b3f64f0396e1016afbe31aec9ea69b62

diff --git a/manifest b/manifest
index f6a0ad789ae38301a18f0dc886b28213bfc2952e..5257f293a28228f4eb28e533947ca46d7439b1ac 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reorganize\sthe\sproxy-locking\smethod\sin\sos_unix.c.\s\sAdditional\scleanup.\s(CVS\s5971)
-D 2008-12-03T22:32:45
+C Fix\sa\smissing\sforward\sdeclaration\sthat\sis\sneeded\swhen\nSQLITE_PREFER_PROXY_LOCKING\sis\sdefined.\s(CVS\s5972)
+D 2008-12-03T22:48:33
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0aa7bbe3be6acc4045706e3bb3fd0b8f38f4a3b5
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -137,7 +137,7 @@ F src/os.c 0b411644b87ad689d7250bbfd1834d99b81a3df4
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c 36196e71292a44bf2d393413cd8c86199694b8b4
-F src/os_unix.c 540aebcdfbaa2e4271a8f679f8ea3f617745cdc0
+F src/os_unix.c bc3e50bcc7d97c0ea2b75b20bc2b5b96ed677270
 F src/os_win.c 3dff41670fb9798a869c636626bb7d6d8b6a45bb
 F src/pager.c a193da9e271898077de815819e4c29fc2b6ece2a
 F src/pager.h a02ef8e6cc7e78b54874166e5ce786c9d4c489bf
@@ -662,7 +662,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 3efedac6aa4f544d40c2f782109d4e1795e449a0
-R afe9d5adf198ca462dbe77afee945c10
+P 31f6090e22b54d657afc8c23171d000d47850205
+R 5a18d457ddc309d1c2fbda88075de290
 U drh
-Z 2fd5c78cbc9007cc32a572d2667be6ae
+Z e5ab96427cc5098a8e91665c39652c64

diff --git a/manifest.uuid b/manifest.uuid
index c6b8820f136b3ca7d746ffa4fcb49c8fcf1aeaec..6854476c689795256d0666837ab43c415d7b67f3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31f6090e22b54d657afc8c23171d000d47850205
\ No newline at end of file
+24235300b3f64f0396e1016afbe31aec9ea69b62
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index df483af1309c326de1e2a0bd08ae318b7fb70ae9..0f4bb71a842aa8af92c7d8ee8bbd53e89080172a 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -43,7 +43,7 @@
 **   *  Definitions of sqlite3_vfs objects for all locking methods
 **      plus implementations of sqlite3_os_init() and sqlite3_os_end().
 **
-** $Id: os_unix.c,v 1.227 2008/12/03 22:32:45 drh Exp $
+** $Id: os_unix.c,v 1.228 2008/12/03 22:48:33 drh Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
@@ -3437,6 +3437,13 @@ static int getTempname(int nBuf, char *zBuf){
   return SQLITE_OK;
 }
 
+/*
+** Routine to transform a unixFile into a proxy-locking unixFile.
+** Implementation in the proxy-lock division, but used by unixOpen()
+** if SQLITE_PREFER_PROXY_LOCKING is defined.
+*/
+static int proxyTransformUnixFile(unixFile*, const char*);
+
 
 /*
 ** Open the file zPath.