From: shane <shane@noemail.net>
Date: Mon, 1 Sep 2008 22:15:18 +0000 (+0000)
Subject: Add define for INVALID_FILE_ATTRIBUTES if it is not already defined, as some older... 
X-Git-Tag: version-3.6.10~520
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=171fa295c3561dc839957478ec57ee4c135c566a;p=thirdparty%2Fsqlite.git

Add define for INVALID_FILE_ATTRIBUTES if it is not already defined, as some older Windows compilers do not define it. (CVS 5657)

FossilOrigin-Name: e0461f8755daa9f57e056810de9ea347ff8dd986
---

diff --git a/manifest b/manifest
index dab220c174..414ac57ed3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\s\s(_MSC_VER>1200)\sto\sSQLITE_DEPRECATED\sand\sSQLITE_EXPERIMENTAL\sdefines\ssince\s__declspec(deprecated)\sisn't\ssupported\sby\sVC\s6\sor\searlier.\s\sTicket\s#3347.\s(CVS\s5656)
-D 2008-09-01T22:06:23
+C Add\sdefine\sfor\sINVALID_FILE_ATTRIBUTES\sif\sit\sis\snot\salready\sdefined,\sas\ssome\solder\sWindows\scompilers\sdo\snot\sdefine\sit.\s(CVS\s5657)
+D 2008-09-01T22:15:19
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -134,7 +134,7 @@ 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_win.c aefe9ee26430678a19a058a874e4e2bd91398142
+F src/os_win.c 3209dc0ed734291764393ea8d534ba0d8696a540
 F src/pager.c 032d11049af4ec49bdbaa3584e7ce9887098b66a
 F src/pager.h c45380ca9d0933ea5bc4ecb3a43958b6d2ec5a9c
 F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
@@ -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 9cf484fc17944ffa14335e391112d82d2390d116
-R 8d8bb8fb8868373b20efefc5087e7a3e
+P 4bcaed08a1b50aef9f4f8a447a35d8678df92050
+R 5a278aaa54c5ca28c8bb36a9539cf368
 U shane
-Z b4739fa06590f36964521c309e7e2f82
+Z 7989bd87da9eb95ab7ab6fcd6ecbf5bb
diff --git a/manifest.uuid b/manifest.uuid
index 4e7c11c9b5..6398e66546 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4bcaed08a1b50aef9f4f8a447a35d8678df92050
\ No newline at end of file
+e0461f8755daa9f57e056810de9ea347ff8dd986
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index e0194d3bd0..a143ffbf54 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.132 2008/07/31 01:34:34 shane Exp $
+** $Id: os_win.c,v 1.133 2008/09/01 22:15:19 shane Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_WIN               /* This file is used for windows only */
@@ -62,6 +62,13 @@
 */
 #include "os_common.h"
 
+/*
+** Some microsoft compilers lack this definition.
+*/
+#ifndef INVALID_FILE_ATTRIBUTES
+# define INVALID_FILE_ATTRIBUTES ((DWORD)-1) 
+#endif
+
 /*
 ** Determine if we are dealing with WindowsCE - which has a much
 ** reduced API.