status-im
/
sqlcipher
mirror of https://github.com/status-im/sqlcipher.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Billy Gray 2011-10-12 15:31:42 -04:00
parent 1d437e4121
commit ff64398d84
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sqlcipher.xcodeproj/project.pbxproj
View File

@ -192,7 +192,6 @@
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
"$(OPENSSL_SRC)/include", "$(OPENSSL_SRC)/include",
"$(DITTO_SRC)",
); );
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
@ -215,7 +214,6 @@
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
"$(OPENSSL_SRC)/include", "$(OPENSSL_SRC)/include",
"$(DITTO_SRC)",
); );
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = ( OTHER_CFLAGS = (

2
src/func.c
View File

@ -1418,14 +1418,12 @@ static void groupConcatFinalize(sqlite3_context *context){
** of the built-in functions above are part of the global function set. ** of the built-in functions above are part of the global function set.
** This routine only deals with those that are not global. ** This routine only deals with those that are not global.
*/ */
#include "ditto_funcs.c"
void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
int rc = sqlite3_overload_function(db, "MATCH", 2); int rc = sqlite3_overload_function(db, "MATCH", 2);
assert( rc==SQLITE_NOMEM || rc==SQLITE_OK ); assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
if( rc==SQLITE_NOMEM ){ if( rc==SQLITE_NOMEM ){
db->mallocFailed = 1; db->mallocFailed = 1;
} }
#include "ditto_globals.c"
} }
/* /*