From d39fa70c79ce45d11cadb03ec23d77db058a06b5 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Thu, 16 Oct 2008 13:27:40 +0000 Subject: [PATCH] Fix an error in (5826). (CVS 5828) FossilOrigin-Name: 8065a92f705dfa04863ba4a828f5bd2803901be8 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_unix.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 5032edd7b0..5cf652ea48 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\snaming\sproblem\swhen\sSQLITE_MUTEX_NOOP\sis\sused.\s(CVS\s5827) -D 2008-10-15T19:03:03 +C Fix\san\serror\sin\s(5826).\s(CVS\s5828) +D 2008-10-16T13:27:41 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 2014e5a4010ad5ebbcaedff98240b3d14ee83838 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -136,7 +136,7 @@ F src/os.c 0b411644b87ad689d7250bbfd1834d99b81a3df4 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60 F src/os_os2.c 24221ff5ab20cf3472e3ec7eec595f759de55298 -F src/os_unix.c 85d7e98eb2a81b9aae38b2cd7011b881c0f91ef0 +F src/os_unix.c 5e3b3c9a54546249c1317cff5343e965192f7f2b F src/os_win.c 13bed718f62d64031b17bb3685adcf994dbf0232 F src/pager.c d98f56128e849083f2f612196efebd982c491fea F src/pager.h 9c1917be28fff58118e1fe0ddbc7adfb8dd4f44d @@ -648,7 +648,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 8ef141644edc5182785c6a554222c2ffbe92fef5 -R 1bb6aba69f0e6d873811151df726637f -U drh -Z eb9de0203accf5058eb797c96ab867a2 +P 35ce71c6f19953a17aa37abe1c0c97685070e2f6 +R c1c21d438b41c18bd1620dc0c406c789 +U danielk1977 +Z 3caaf7b724140890e1c01c8a3a531546 diff --git a/manifest.uuid b/manifest.uuid index 89209fdf4e..90cceff2ac 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -35ce71c6f19953a17aa37abe1c0c97685070e2f6 \ No newline at end of file +8065a92f705dfa04863ba4a828f5bd2803901be8 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 2f972130a8..12509d1f6e 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.206 2008/10/15 16:02:49 danielk1977 Exp $ +** $Id: os_unix.c,v 1.207 2008/10/16 13:27:41 danielk1977 Exp $ */ #include "sqliteInt.h" #if SQLITE_OS_UNIX /* This file is used on unix only */ @@ -2681,7 +2681,7 @@ static int unixDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){ int rc = SQLITE_OK; SimulateIOError(return SQLITE_IOERR_DELETE); unlink(zPath); -#ifdef SQLITE_DISABLE_DIRSYNC +#ifndef SQLITE_DISABLE_DIRSYNC if( dirSync ){ int fd; rc = openDirectory(zPath, &fd);