From ff64398d847db721f3e177104752fac8c5c75752 Mon Sep 17 00:00:00 2001 From: Billy Gray Date: Wed, 12 Oct 2011 15:31:42 -0400 Subject: [PATCH] remove the customizations that were merged in with the project file changes we made on the ditto branch --- sqlcipher.xcodeproj/project.pbxproj | 2 -- src/func.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index a5d9a3a..3feaac8 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -192,7 +192,6 @@ HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)", "$(OPENSSL_SRC)/include", - "$(DITTO_SRC)", ); INSTALL_PATH = /usr/local/lib; OTHER_CFLAGS = ( @@ -215,7 +214,6 @@ 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 ab72665..d461412 100644 --- a/src/func.c +++ b/src/func.c @@ -1418,14 +1418,12 @@ 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" } /*