diff --git a/manifest b/manifest index f96daa44cb..aadcc4a9b9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Temporarily\srevert\sto\susing\ssqlite3_transfer_bindings()\sinternally.\s(CVS\s5673) -D 2008-09-04T05:53:45 +C If\sSQLITE_ENABLE_LOCKING_STYLE\sis\sdefined,\shave\sthe\sos_unix.c\smodule\soffer\sthe\sfollowing\sextra\sVFS\simplementations\sfor\sexplicitly\sselecting\sa\slocking-style:\s"unix-none",\s"unix-afp",\s"unix-posix",\s"unix-flock"\sand\s"unix-dotfile".\s(CVS\s5674) +D 2008-09-04T06:22:26 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -133,7 +133,7 @@ F src/os.c 543976efc0b177b40779d5fc00f709d6888d6903 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60 F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0 -F src/os_unix.c 4665cef7639dd937893c3ea076f0e8a8f215bb32 +F src/os_unix.c e99f82f1f777cd6030e1e8c7d1fabc7130684a99 F src/os_win.c 3209dc0ed734291764393ea8d534ba0d8696a540 F src/pager.c 5a6b59089511db451df45414eb137110b04b1419 F src/pager.h c45380ca9d0933ea5bc4ecb3a43958b6d2ec5a9c @@ -630,7 +630,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 821c387d159fd86cedb56c1130f0416bf5c65e6c -R 753911b80db2f8bb0aa6e4f9b7c9a8e1 +P 690ff3853b4e46ac7126992c84455237e265fd98 +R 0f5ed9d191e9832134b124328b6cfac0 U danielk1977 -Z 492ed7ab9b6ffd43567ca19889eedabf +Z 94594e2b25c952001e1b9d2c3bf01277 diff --git a/manifest.uuid b/manifest.uuid index 72e3ffec83..36e8d457b7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -690ff3853b4e46ac7126992c84455237e265fd98 \ No newline at end of file +6e8fb64639cc7451005d9f1dd2d0ef62576abbdd \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 30a63979c2..45625ffe68 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -12,7 +12,7 @@ ** ** This file contains code that is specific to Unix systems. ** -** $Id: os_unix.c,v 1.198 2008/08/22 18:41:37 aswift Exp $ +** $Id: os_unix.c,v 1.199 2008/09/04 06:22:26 danielk1977 Exp $ */ #include "sqliteInt.h" #if SQLITE_OS_UNIX /* This file is used on unix only */ @@ -2946,7 +2946,6 @@ int sqlite3_os_init(void){ static sqlite3_vfs unixVfs = UNIXVFS("unix", 0); #ifdef SQLITE_ENABLE_LOCKING_STYLE -#if 0 int i; static sqlite3_vfs aVfs[] = { UNIXVFS("unix-posix", LOCKING_STYLE_POSIX), @@ -2958,7 +2957,6 @@ int sqlite3_os_init(void){ for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){ sqlite3_vfs_register(&aVfs[i], 0); } -#endif #endif sqlite3_vfs_register(&unixVfs, 1); return SQLITE_OK;