From: drh <drh@noemail.net>
Date: Fri, 1 Apr 2011 13:29:29 +0000 (+0000)
Subject: Move a variable declaration inside an #ifdef to avoid a compiler warning.
X-Git-Tag: version-3.7.6~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=026663d305681a94b90748a9a76988fab2dc6087;p=thirdparty%2Fsqlite.git

Move a variable declaration inside an #ifdef to avoid a compiler warning.

FossilOrigin-Name: 7a6d05dfbc36310683dd51a280e9283cef4f9056
---

diff --git a/manifest b/manifest
index 662518317a..f2ec24b889 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sos_unix.c,\sdo\snot\sreturn\sSQLITE_BUSY\sto\sSQLite\sfollowing\san\serror\sin\sfcntl(F_UNLCK),\sregardless\sof\sthe\svalue\sof\serrno.
-D 2011-04-01T11:56:33
+C Move\sa\svariable\sdeclaration\sinside\san\s#ifdef\sto\savoid\sa\scompiler\swarning.
+D 2011-04-01T13:29:29.578
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 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 2596fd2d5d0976c6c0c628d0c3c7c4e7a724f4cf
-F src/os_unix.c 8115c85152a7fce1bccdc195e3b0aeffcea2afd7
+F src/os_unix.c a3b4cdf50a9c9be8b50dc4932354ab749962a07f
 F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
 F src/pager.c 6aa906b60a59664ba58d3f746164bb010d407ce1
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@@ -895,7 +895,7 @@ F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/lemon.c dfd81a51b6e27e469ba21d01a75ddf092d429027
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
-F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
+F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c.tcl cf44512a48112b1ba09590548660a5a6877afdb3
 F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
@@ -920,7 +920,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8088031bc949bd4efb5edf33bbd1bce5700fca56
-R 9af7bbe929f0a94074f942a296a7973f
-U dan
-Z d897a548359e67df244f4d51f77e5957
+P ff6dfe6ed74f9ff1669b2bda41d61a01cd0a1bc6
+R d5791c0430fd039b1944fc050ba93b96
+U drh
+Z dde3d78a013928b388d93ef247b7695b
diff --git a/manifest.uuid b/manifest.uuid
index 2f3043a27c..1566c86a65 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff6dfe6ed74f9ff1669b2bda41d61a01cd0a1bc6
\ No newline at end of file
+7a6d05dfbc36310683dd51a280e9283cef4f9056
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 6f93351112..f04b6af273 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1539,7 +1539,6 @@ static int posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){
   struct flock lock;
   int rc = SQLITE_OK;
   int h;
-  int tErrno;                      /* Error code from system call errors */
 
   assert( pFile );
   OSTRACE(("UNLOCK  %d %d was %d(%d,%d) pid=%d (unix)\n", pFile->h, eFileLock,
@@ -1594,6 +1593,7 @@ static int posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){
 #endif
 #if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
       if( handleNFSUnlock ){
+        int tErrno;               /* Error code from system call errors */
         off_t divSize = SHARED_SIZE - 1;
         
         lock.l_type = F_UNLCK;
diff --git a/tool/mkopts.tcl b/tool/mkopts.tcl
old mode 100644
new mode 100755