Fix a bad #endif with the previous check-in on this branch.

FossilOrigin-Name: 915713ffe4d02ddf1d09a82e39a47b88d3d95ea0

diff --git a/manifest b/manifest
index 0382d0016aa5e60957f01590b5759964a9e89343..b54f93645f20cf49ceba4ec55081c73fc01f995e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sstatvfs()\sin\sos_unix.c,\sfor\sdetermining\sthe\ssector\ssize.\nThis\scauses\smany\sTCL\stest\sfailures\sunder\sLinux.
-D 2011-12-17T16:09:16.668
+C Fix\sa\sbad\s#endif\swith\sthe\sprevious\scheck-in\son\sthis\sbranch.
+D 2011-12-17T16:25:17.970
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F src/os.c 28bbdab2170dfce84d86c45456a18eab1d0f99a9
 F src/os.h 549b1a2e5e0ed1e1499f252dac126c4973e7379c
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c 987407fd031dda051cd1ce483e98cdd10c876406
+F src/os_unix.c a1d12b748d323cf88580ed4636526979438d2ced
 F src/os_win.c 197d23ce8a0dff748e766e034bf95ff756dd3884
 F src/pager.c c7c32a1c279e0bbbde3578172985c41d4c5efc35
 F src/pager.h 5cd760857707529b403837d813d86b68938d6183
@@ -984,10 +984,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 44ca4d123385d759c11919865525c998c2e35bdb
-R 7de59b5af451aa5e783f935f751fa23e
-T *branch * statvfs
-T *sym-statvfs *
-T -sym-trunk *
+P e0d44450b9bec8ea7b057c1ad0a2088cd3f1f221
+R b8a55204c658dabf0660ecc7d93188e9
 U drh
-Z 2ad2e7d7ae34e5854d882a8ab2c85c44
+Z 436c2db7515ae81b46726abca10da159

diff --git a/manifest.uuid b/manifest.uuid
index 3016870f55dcc7f21a8381da58033138949f0790..72300a33d95e4df2a4ea45ead0cec415dd53b717 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e0d44450b9bec8ea7b057c1ad0a2088cd3f1f221
\ No newline at end of file
+915713ffe4d02ddf1d09a82e39a47b88d3d95ea0
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 9f88d24b45d1940dcb2deb84ccb3f4345ced7027..aa7002885c241f7ae3bd8cfce3be1f8aeb7c47ed 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3599,8 +3599,8 @@ static int unixSectorSize(sqlite3_file *pFile){
     if( sz<512 || sz>65536 || (sz&(sz-1))!=0 ){
       p->szSector = SQLITE_DEFAULT_SECTOR_SIZE;
     }
-  }
 #endif
+  }
   return p->szSector;
 }