From 84ca3837c28248ba1537e3bc4eb2bc6d00fd05d3 Mon Sep 17 00:00:00 2001 From: shane Date: Thu, 13 Nov 2008 18:20:43 +0000 Subject: [PATCH] Added support for -DSQLITE_NO_SYNC to os_win.c. (CVS 5904) FossilOrigin-Name: 2649337937077d2dba7cdc7473fcd176aa252a52 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_win.c | 9 ++++++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 486c49f68e..3f66a68c58 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixed\stypo\sin\stkt3472.test\sthat\sprevented\sthe\stest\sfrom\srunning.\s(CVS\s5903) -D 2008-11-13T18:02:52 +C Added\ssupport\sfor\s-DSQLITE_NO_SYNC\sto\sos_win.c.\s(CVS\s5904) +D 2008-11-13T18:20:43 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 6cbc7db84c23804c368bc7ffe51367412212d7b2 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -137,7 +137,7 @@ F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60 F src/os_os2.c 63be0987dbeb42e9b08c831863d2a315953b86e1 F src/os_unix.c af390f03ebe339e63911aec2d4ccd1e53fde581e -F src/os_win.c e208cbbceac63c1dd881d0909de5a4679a2c6992 +F src/os_win.c b1cd079217818e610d6a62c6c71f1e5366a70efe F src/pager.c c3f46fcb60a9049dd2f3039dfcde60fbbb83b41b F src/pager.h 4a57b219c0765fe1870238064e3f46e4eb2cf5af F src/parse.y 2c4758b4c5ead6de8cf7112f5a7cce7561d313fe @@ -657,7 +657,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P eabb8b7591eab164c637d78ca4df00fcb5bd3c5b -R 2ecf44e306b7d1d49266734c23e37e25 +P 428a5479200dc24e2ee9b4a85ef6caadacbdbbd7 +R 0862238cedee5bfa8e1cf288700d9240 U shane -Z 8dffa1ec74c2c0db9f4d26b8359e648a +Z 83a561c6084b21462d245b6589e2fbad diff --git a/manifest.uuid b/manifest.uuid index 008097dcc1..24730bb9f5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -428a5479200dc24e2ee9b4a85ef6caadacbdbbd7 \ No newline at end of file +2649337937077d2dba7cdc7473fcd176aa252a52 \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index f09b69861f..ab797a6e12 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -12,7 +12,7 @@ ** ** This file contains code that is specific to windows. ** -** $Id: os_win.c,v 1.137 2008/11/07 00:06:18 drh Exp $ +** $Id: os_win.c,v 1.138 2008/11/13 18:20:43 shane Exp $ */ #include "sqliteInt.h" #if SQLITE_OS_WIN /* This file is used for windows only */ @@ -751,11 +751,18 @@ static int winSync(sqlite3_file *id, int flags){ } sqlite3_sync_count++; #endif + /* If we compiled with the SQLITE_NO_SYNC flag, then syncing is a + ** no-op + */ +#ifdef SQLITE_NO_SYNC + return SQLITE_OK; +#else if( FlushFileBuffers(pFile->h) ){ return SQLITE_OK; }else{ return SQLITE_IOERR; } +#endif } /* -- 2.47.2