diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-12 22:58:49 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-12 22:58:49 +0000 |
| commit | 41df2e668668137091861464cabe91cf110f4302 (patch) | |
| tree | 921cb941ba1a59df6cc1650b935d249fa0b73f84 /cdr | |
| parent | 476ed07a1111e6172eb4f860ad239d3ef7bb5f49 (diff) | |
manual update, since automerge is not running at this time
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@48421 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/Makefile | 2 | ||||
| -rw-r--r-- | cdr/cdr_pgsql.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cdr/Makefile b/cdr/Makefile index 6be6d9b95..84ea0fe4b 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -65,7 +65,7 @@ endif # # PGSQL stuff... Autoconf anyone?? # -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) MODS+=cdr_pgsql.so endif diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index 776bf6a54..17ed573c3 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -64,8 +64,8 @@ static int connected = 0; AST_MUTEX_DEFINE_STATIC(pgsql_lock); -PGconn *conn; -PGresult *result; +PGconn *conn = NULL; +PGresult *result = NULL; static int pgsql_log(struct ast_cdr *cdr) { |