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

Side by Side 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 unified diff | Download patch
OLDNEW
(Empty)
1 From 59a7fecd66719e55105c172e8719ef9071852364 Mon Sep 17 00:00:00 2001
2 From: Scott Hess <shess@chromium.org>
3 Date: Tue, 14 Mar 2017 13:45:46 -0700
4 Subject: [PATCH 09/10] [build] Fix _CRT_RAND_S conflict in sqliteInt.h
5
6 Chromium already defines this, for the same reasons that SQLite does,
7 but it conflicts with SQLite's definition.
8
9 BUG=701522
10 ---
11 third_party/sqlite/src/src/sqliteInt.h | 3 +++
12 1 file changed, 3 insertions(+)
13
14 diff --git a/third_party/sqlite/src/src/sqliteInt.h b/third_party/sqlite/src/src /sqliteInt.h
15 index f9768895ae98..ee58edad775c 100644
16 --- a/third_party/sqlite/src/src/sqliteInt.h
17 +++ b/third_party/sqlite/src/src/sqliteInt.h
18 @@ -55,8 +55,11 @@
19 ** or higher.
20 */
21 #if defined(_MSC_VER) && _MSC_VER>=1400
22 +/* TODO(shess): Already defined by build/config/win/BUILD.gn */
23 +#ifndef _CRT_RAND_S
24 # define _CRT_RAND_S
25 #endif
26 +#endif
27
28 /*
29 ** Include the header file used to customize the compiler options for MSVC.
30 --
31 2.11.0
32
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698