From: mistachkin <mistachkin@noemail.net>
Date: Mon, 16 Sep 2013 19:27:36 +0000 (+0000)
Subject: Minor consistency fixes to the Win32 RC file.
X-Git-Tag: version-3.8.1~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e62d373031e3e81688d18a099c79d03ad7609f6a;p=thirdparty%2Fsqlite.git

Minor consistency fixes to the Win32 RC file.

FossilOrigin-Name: 619c5211b91aef98794e2e0a6f03832619fc83c0
---

diff --git a/manifest b/manifest
index cc269e2b53..02f095bc1e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sdate\sand\stime\sfunctions\suse\sthe\sexact\ssame\snotion\sof\s"now"\sfor\severy\ninvocation\swithin\sthe\ssame\scall\sto\ssqlite3_step().
-D 2013-09-16T12:57:19.083
+C Minor\sconsistency\sfixes\sto\sthe\sWin32\sRC\sfile.
+D 2013-09-16T19:27:36.964
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -219,7 +219,7 @@ F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c fc60e8e539cb9a895cac197de95048759b0f3ab0
 F src/shell.c d920a891ca09b8bd262cced7fb0ab9d723f7a747
 F src/sqlite.h.in ec40aa958a270416fb04b4f72210357bf163d2c5
-F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
+F src/sqlite3.rc 9bc020ab42953c9b534a36625f2aea95d305f8f0
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 F src/sqliteInt.h 18c7f80e7e23098942436f7286e9c93adc6908be
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@ -1114,7 +1114,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P d5fc3f1dabc7227230dcabdd808357f63432357b
-R ead99db3a62653402af31bb55f28a609
-U drh
-Z 697f82a0e98989fae400e82ea730851a
+P daf6ba413cb3cb6065774ba07495eab4a28b49b0
+R bf8bf2a00e798ca367a5d08e40be962c
+U mistachkin
+Z a832b9bdbbfaa169c6e70acd3e4ce465
diff --git a/manifest.uuid b/manifest.uuid
index ed50928ac9..b48c5a2510 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-daf6ba413cb3cb6065774ba07495eab4a28b49b0
\ No newline at end of file
+619c5211b91aef98794e2e0a6f03832619fc83c0
\ No newline at end of file
diff --git a/src/sqlite3.rc b/src/sqlite3.rc
index 969876da1e..19ba3deae5 100644
--- a/src/sqlite3.rc
+++ b/src/sqlite3.rc
@@ -19,6 +19,10 @@
 #include "windows.h"
 #endif
 
+#ifndef VS_FF_NONE
+#  define VS_FF_NONE            0x00000000L
+#endif
+
 #include "sqlite3.h"
 #include "sqlite3rc.h"
 
@@ -38,11 +42,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION SQLITE_RESOURCE_VERSION
   PRODUCTVERSION SQLITE_RESOURCE_VERSION
-  FILEFLAGSMASK 0x3F
+  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #if defined(_DEBUG)
-  FILEFLAGS 0x1L
+  FILEFLAGS VS_FF_DEBUG
 #else
-  FILEFLAGS 0x0L
+  FILEFLAGS VS_FF_NONE
 #endif
   FILEOS VOS__WINDOWS32
   FILETYPE VFT_APP