From cb5a77187de8b308a379dcd4d69a8ebcf33cf305 Mon Sep 17 00:00:00 2001 From: Billy Gray Date: Wed, 12 Oct 2011 15:36:51 -0400 Subject: [PATCH] Revert "remove the customizations that were merged in with the project file changes we made on the ditto branch" Doing this to restore Ditto includes on our down-stream branch. Note: no changes should be made to this branch for up-stream merging! This reverts commit ff64398d847db721f3e177104752fac8c5c75752. --- sqlcipher.xcodeproj/project.pbxproj | 2 ++ src/func.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index 3feaac8..a5d9a3a 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -192,6 +192,7 @@ HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)", "$(OPENSSL_SRC)/include", + "$(DITTO_SRC)", ); INSTALL_PATH = /usr/local/lib; OTHER_CFLAGS = ( @@ -214,6 +215,7 @@ HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)", "$(OPENSSL_SRC)/include", + "$(DITTO_SRC)", ); INSTALL_PATH = /usr/local/lib; OTHER_CFLAGS = ( diff --git a/src/func.c b/src/func.c index d461412..ab72665 100644 --- a/src/func.c +++ b/src/func.c @@ -1418,12 +1418,14 @@ static void groupConcatFinalize(sqlite3_context *context){ ** of the built-in functions above are part of the global function set. ** This routine only deals with those that are not global. */ +#include "ditto_funcs.c" void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ int rc = sqlite3_overload_function(db, "MATCH", 2); assert( rc==SQLITE_NOMEM || rc==SQLITE_OK ); if( rc==SQLITE_NOMEM ){ db->mallocFailed = 1; } +#include "ditto_globals.c" } /*