From: mistachkin <mistachkin@noemail.net>
Date: Fri, 16 Sep 2011 20:16:36 +0000 (+0000)
Subject: Silence harmless compiler warning about redefinition of the _CRT_SECURE_NO_WARNINGS... 
X-Git-Tag: version-3.7.8~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3b2ff5182214226acbced1b52ca35d9d08fb464;p=thirdparty%2Fsqlite.git

Silence harmless compiler warning about redefinition of the _CRT_SECURE_NO_WARNINGS macro by shell.c.

FossilOrigin-Name: 690220717f3d92d4fb7bd72226fc8d5f38f5fbcf
---

diff --git a/manifest b/manifest
index 5c4f08aa37..9ec01e70a4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunreachable\sbranches\sfrom\sthe\sprevious\schange.\s\sAdd\sadditional\ntest\scases.
-D 2011-09-16T19:04:03.371
+C Silence\sharmless\scompiler\swarning\sabout\sredefinition\sof\sthe\s_CRT_SECURE_NO_WARNINGS\smacro\sby\sshell.c.
+D 2011-09-16T20:16:36.109
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -180,7 +180,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2
-F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
+F src/shell.c 13fe2aeddc3cc90d6a273831d1f63736d1596f81
 F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
 F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
 F src/sqliteInt.h feb4f2b212fe36bbd951e44d2490c6aacf02f689
@@ -962,7 +962,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 0156f10e23daca0e2504cd293a67ed0233d254d0
-R 6ac04cf9823838428848cb3eecc8467b
-U drh
-Z fc85b6ee205b1fa04072a560842933fc
+P cf51ef8ab8a610ddf64f66970dd689fe1df405b8
+R 82ae90fbdac03554dc4ad676e24ddb3c
+U mistachkin
+Z 2ae026d8ea384ca85214e134ca7c45bb
diff --git a/manifest.uuid b/manifest.uuid
index b05ad8b2ae..a0307659f7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cf51ef8ab8a610ddf64f66970dd689fe1df405b8
\ No newline at end of file
+690220717f3d92d4fb7bd72226fc8d5f38f5fbcf
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 05272b2dfa..9759e93b00 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 */
-#if defined(_WIN32) || defined(WIN32)
+#if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS)
 /* This needs to come before any includes for MSVC compiler */
 #define _CRT_SECURE_NO_WARNINGS
 #endif