tstack/lnav
1
1
Fork 0
mirror of https://github.com/tstack/lnav.git synced 2024-09-11 13:05:51 +03:00
Code Issues Projects Releases Wiki Activity

[build] some more centos build fixes

Browse Source
This commit is contained in:
Timothy Stack 2014-06-13 21:39:03 -07:00
parent a02bf365e9
commit b205a3ec82
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/environ_vtab.cc
View File

@ -245,14 +245,13 @@ static int vt_update(sqlite3_vtab *tab,
retval = SQLITE_OK; retval = SQLITE_OK;
} else if (getenv(name) != NULL) { } else if (getenv(name) != NULL) {
#ifdef SQLITE_FAIL
int rc; int rc;
rc = sqlite3_vtab_on_conflict(p_vt->db); rc = sqlite3_vtab_on_conflict(p_vt->db);
// fprintf(stderr, "got rc %d\n", rc); // fprintf(stderr, "got rc %d\n", rc);
switch (rc) { switch (rc) {
#ifdef SQLITE_FAIL
case SQLITE_FAIL: case SQLITE_FAIL:
#endif
case SQLITE_ABORT: case SQLITE_ABORT:
tab->zErrMsg = sqlite3_mprintf( tab->zErrMsg = sqlite3_mprintf(
"An environment variable with the name '%s' already exists", "An environment variable with the name '%s' already exists",
@ -260,13 +259,12 @@ static int vt_update(sqlite3_vtab *tab,
return rc; return rc;
case SQLITE_IGNORE: case SQLITE_IGNORE:
return SQLITE_OK; return SQLITE_OK;
#ifdef SQLITE_REPLACE
case SQLITE_REPLACE: case SQLITE_REPLACE:
#endif
break; break;
default: default:
return rc; return rc;
} }
#endif
} }
if (argc == 4) { if (argc == 4) {

2
src/sql_util.cc
View File

@ -517,7 +517,9 @@ static void sqlite_logger(void *dummy, int code, const char *msg)
void sql_install_logger(void) void sql_install_logger(void)
{ {
#ifdef SQLITE_CONFIG_LOG
sqlite3_config(SQLITE_CONFIG_LOG, sqlite_logger, NULL); sqlite3_config(SQLITE_CONFIG_LOG, sqlite_logger, NULL);
#endif
} }
char *sql_quote_ident(const char *ident) char *sql_quote_ident(const char *ident)