From: drh <drh@noemail.net>
Date: Sat, 27 Apr 2013 12:13:29 +0000 (+0000)
Subject: Untested fix for building on VxWorks.
X-Git-Tag: version-3.7.17~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5797545de1b6bd30acc640443069a612e1b6194;p=thirdparty%2Fsqlite.git

Untested fix for building on VxWorks.

FossilOrigin-Name: f14d55cf358b0392d3b8cd61dc85f43a610a8edf
---

diff --git a/manifest b/manifest
index 0536079cee..b47b06dfb4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sformatting\stypo\sin\sa\scomment.\s\sNo\schanges\sto\scode.
-D 2013-04-26T19:33:34.383
+C Untested\sfix\sfor\sbuilding\son\sVxWorks.
+D 2013-04-27T12:13:29.526
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -177,7 +177,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
-F src/os_unix.c f86cd628ffb9ccf3adcc5c15b02c00a64eaf598e
+F src/os_unix.c 5a214c5431fd005dbb3b8bbaaa306433e8e9b48f
 F src/os_win.c 673b3e3d1fa3040d8d95a7f1f5e0e553aed56cfb
 F src/pager.c 4a9160d268977e56ae2df90182050ab30fca715d
 F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
@@ -1062,7 +1062,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P c47144e98c0a0f9e09780c945de10c57b6a495ea
-R 9aa1f84a471b601353c6669ae1266379
+P 7a97226ffe174349e7113340f5354c4e44bd9738
+R 45f16684eb908e3d81d1d0d938ab9d11
 U drh
-Z 18431ca135b1f0070cd379da7401fa7c
+Z 3089ee3240913ca0c76196e0917eb228
diff --git a/manifest.uuid b/manifest.uuid
index 89ec5fbc80..8005ea1784 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a97226ffe174349e7113340f5354c4e44bd9738
\ No newline at end of file
+f14d55cf358b0392d3b8cd61dc85f43a610a8edf
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 1200ff352b..0074412410 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5287,9 +5287,8 @@ static int fillInUnixFile(
     if( h>=0 ) robust_close(pNew, h, __LINE__);
     h = -1;
     osUnlink(zFilename);
-    isDelete = 0;
+    pNew->ctrlFlags |= UNIXFILE_DELETE;
   }
-  if( isDelete ) pNew->ctrlFlags |= UNIXFILE_DELETE;
 #endif
   if( rc!=SQLITE_OK ){
     if( h>=0 ) robust_close(pNew, h, __LINE__);