提交 dc1477e5 authored 作者: Anthony Minessale's avatar Anthony Minessale

fix build without pgsql

上级 7e28946b
...@@ -122,11 +122,9 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_handle_disconnect(switch_pgsq ...@@ -122,11 +122,9 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_handle_disconnect(switch_pgsq
#endif #endif
} }
#ifdef SWITCH_HAVE_PGSQL
SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_send_query(switch_pgsql_handle_t *handle, const char* sql) SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_send_query(switch_pgsql_handle_t *handle, const char* sql)
{ {
#ifdef SWITCH_HAVE_PGSQL
char *err_str; char *err_str;
if (!PQsendQuery(handle->con, sql)) { if (!PQsendQuery(handle->con, sql)) {
...@@ -139,14 +137,16 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_send_query(switch_pgsql_handl ...@@ -139,14 +137,16 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_send_query(switch_pgsql_handl
return SWITCH_PGSQL_SUCCESS; return SWITCH_PGSQL_SUCCESS;
error: error:
#endif
return SWITCH_PGSQL_FAIL; return SWITCH_PGSQL_FAIL;
} }
SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_cancel_real(const char *file, const char *func, int line, switch_pgsql_handle_t *handle) SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_cancel_real(const char *file, const char *func, int line, switch_pgsql_handle_t *handle)
{ {
switch_pgsql_status_t ret = SWITCH_PGSQL_SUCCESS;
#ifdef SWITCH_HAVE_PGSQL
char err_buf[256]; char err_buf[256];
PGcancel *cancel = NULL; PGcancel *cancel = NULL;
switch_pgsql_status_t ret = SWITCH_PGSQL_SUCCESS;
memset(err_buf, 0, 256); memset(err_buf, 0, 256);
cancel = PQgetCancel(handle->con); cancel = PQgetCancel(handle->con);
...@@ -155,12 +155,14 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_cancel_real(const char *file, ...@@ -155,12 +155,14 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_cancel_real(const char *file,
ret = SWITCH_PGSQL_FAIL; ret = SWITCH_PGSQL_FAIL;
} }
PQfreeCancel(cancel); PQfreeCancel(cancel);
#endif
return ret; return ret;
} }
SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsql_handle_t *handle, switch_pgsql_result_t **result_out, int msec) SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsql_handle_t *handle, switch_pgsql_result_t **result_out, int msec)
{ {
#ifdef SWITCH_HAVE_PGSQL
switch_pgsql_result_t *res; switch_pgsql_result_t *res;
switch_time_t start; switch_time_t start;
switch_time_t ctime; switch_time_t ctime;
...@@ -273,11 +275,14 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsq ...@@ -273,11 +275,14 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsq
return SWITCH_PGSQL_SUCCESS; return SWITCH_PGSQL_SUCCESS;
error: error:
#endif
return SWITCH_PGSQL_FAIL; return SWITCH_PGSQL_FAIL;
} }
SWITCH_DECLARE(void) switch_pgsql_free_result(switch_pgsql_result_t **result) SWITCH_DECLARE(void) switch_pgsql_free_result(switch_pgsql_result_t **result)
{ {
#ifdef SWITCH_HAVE_PGSQL
if (!*result) { if (!*result) {
return; return;
} }
...@@ -287,10 +292,14 @@ SWITCH_DECLARE(void) switch_pgsql_free_result(switch_pgsql_result_t **result) ...@@ -287,10 +292,14 @@ SWITCH_DECLARE(void) switch_pgsql_free_result(switch_pgsql_result_t **result)
} }
free(*result); free(*result);
*result = NULL; *result = NULL;
#else
return;
#endif
} }
SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_finish_results_real(const char* file, const char* func, int line, switch_pgsql_handle_t *handle) SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_finish_results_real(const char* file, const char* func, int line, switch_pgsql_handle_t *handle)
{ {
#ifdef SWITCH_HAVE_PGSQL
switch_pgsql_result_t *res = NULL; switch_pgsql_result_t *res = NULL;
switch_pgsql_status_t final_status = SWITCH_PGSQL_SUCCESS; switch_pgsql_status_t final_status = SWITCH_PGSQL_SUCCESS;
int done = 0; int done = 0;
...@@ -304,8 +313,12 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_finish_results_real(const cha ...@@ -304,8 +313,12 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_finish_results_real(const cha
switch_pgsql_free_result(&res); switch_pgsql_free_result(&res);
} while (!done); } while (!done);
return final_status; return final_status;
#else
return SWITCH_PGSQL_FAIL;
#endif
} }
#ifdef SWITCH_HAVE_PG
static int db_is_up(switch_pgsql_handle_t *handle) static int db_is_up(switch_pgsql_handle_t *handle)
{ {
int ret = 0; int ret = 0;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论