remove the customizations that were merged in with the project file changes we made on the ditto branch

billymeltdown · billymeltdown · commit ff64398d847d · 2011-10-12T15:31:42.000-04:00
diff --git 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
@@ -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"
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1418,14 +1418,12 @@ static void groupConcatFinalize(sqlite3_context *context){`
`1418`	`1418`	`** of the built-in functions above are part of the global function set.`
`1419`	`1419`	`** This routine only deals with those that are not global.`
`1420`	`1420`	`*/`
`1421`		`-#include "ditto_funcs.c"`
`1422`	`1421`	`void sqlite3RegisterBuiltinFunctions(sqlite3 *db){`
`1423`	`1422`	`int rc = sqlite3_overload_function(db, "MATCH", 2);`
`1424`	`1423`	`assert( rc==SQLITE_NOMEM \|\| rc==SQLITE_OK );`
`1425`	`1424`	`if( rc==SQLITE_NOMEM ){`
`1426`	`1425`	`db->mallocFailed = 1;`
`1427`	`1426`	`}`
`1428`		`-#include "ditto_globals.c"`
`1429`	`1427`	`}`
`1430`	`1428`
`1431`	`1429`	`/*`