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

Unified Diff: third_party/sqlite/fts2.patch

Issue 6835006: Convert to SQLite amalgamation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 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
« no previous file with comments | « third_party/sqlite/amalgamation/sqlite3.h ('k') | third_party/sqlite/google_generate_amalgamation.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/fts2.patch
diff --git a/third_party/sqlite/fts2.patch b/third_party/sqlite/fts2.patch
index 1f02161ee29aba22edad93ad7bba7c244e2dc2a1..0cb1a8829d61967a51587d18f0991a9ac970c976 100644
--- a/third_party/sqlite/fts2.patch
+++ b/third_party/sqlite/fts2.patch
@@ -22,6 +22,19 @@ diff -ru ext-orig/fts2/fts2.c ext/fts2/fts2.c
/*
** The code in this file is only compiled if:
**
+@@ -326,8 +326,10 @@
+ #include "fts2_hash.h"
+ #include "fts2_tokenizer.h"
+ #include "sqlite3.h"
+-#include "sqlite3ext.h"
+-SQLITE_EXTENSION_INIT1
++#ifndef SQLITE_CORE
++# include "sqlite3ext.h"
++ SQLITE_EXTENSION_INIT1
++#endif
+
+
+ /* TODO(shess) MAN, this thing needs some refactoring. At minimum, it
@@ -335,6 +349,16 @@
# define TRACE(A)
#endif
@@ -1919,7 +1932,15 @@ diff -ru ext-orig/fts2/fts2_icu.c ext/fts2/fts2_icu.c
diff -ru ext-orig/fts2/fts2_tokenizer.c ext/fts2/fts2_tokenizer.c
--- ext-orig/fts2/fts2_tokenizer.c 2009-09-03 13:32:06.000000000 -0700
+++ ext/fts2/fts2_tokenizer.c 2009-09-18 14:39:41.000000000 -0700
-@@ -33,6 +33,7 @@
+@@ -28,11 +28,14 @@
+
+ #include "sqlite3.h"
+ #include "sqlite3ext.h"
+-SQLITE_EXTENSION_INIT1
++#ifndef SQLITE_CORE
++ SQLITE_EXTENSION_INIT1
++#endif
+
#include "fts2_hash.h"
#include "fts2_tokenizer.h"
#include <assert.h>
« no previous file with comments | « third_party/sqlite/amalgamation/sqlite3.h ('k') | third_party/sqlite/google_generate_amalgamation.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698