remove the customizations that were merged in with the project file changes we made on the ditto branch
This commit is contained in:
parent
1d437e4121
commit
ff64398d84
|
@ -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 = (
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue