Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: third_party/sqlite/patches/0009-build-Fix-_CRT_RAND_S-conflict-in-sqliteInt.h.patch

Issue 2751253002: [sql] Import SQLite 3.17.0. (Closed)
Patch Set: also clang on Linux i386 Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/sqlite/patches/0009-build-Fix-_CRT_RAND_S-conflict-in-sqliteInt.h.patch
diff --git a/third_party/sqlite/patches/0009-build-Fix-_CRT_RAND_S-conflict-in-sqliteInt.h.patch b/third_party/sqlite/patches/0009-build-Fix-_CRT_RAND_S-conflict-in-sqliteInt.h.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0355d22b0e9f0a0e01bd5bfacd4ec8b96c36ea90
--- /dev/null
+++ b/third_party/sqlite/patches/0009-build-Fix-_CRT_RAND_S-conflict-in-sqliteInt.h.patch
@@ -0,0 +1,32 @@
+From 59a7fecd66719e55105c172e8719ef9071852364 Mon Sep 17 00:00:00 2001
+From: Scott Hess <shess@chromium.org>
+Date: Tue, 14 Mar 2017 13:45:46 -0700
+Subject: [PATCH 09/10] [build] Fix _CRT_RAND_S conflict in sqliteInt.h
+
+Chromium already defines this, for the same reasons that SQLite does,
+but it conflicts with SQLite's definition.
+
+BUG=701522
+---
+ third_party/sqlite/src/src/sqliteInt.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/third_party/sqlite/src/src/sqliteInt.h b/third_party/sqlite/src/src/sqliteInt.h
+index f9768895ae98..ee58edad775c 100644
+--- a/third_party/sqlite/src/src/sqliteInt.h
++++ b/third_party/sqlite/src/src/sqliteInt.h
+@@ -55,8 +55,11 @@
+ ** or higher.
+ */
+ #if defined(_MSC_VER) && _MSC_VER>=1400
++/* TODO(shess): Already defined by build/config/win/BUILD.gn */
++#ifndef _CRT_RAND_S
+ # define _CRT_RAND_S
+ #endif
++#endif
+
+ /*
+ ** Include the header file used to customize the compiler options for MSVC.
+--
+2.11.0
+

Powered by Google App Engine
This is Rietveld 408576698