diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 03:39:29 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 03:39:29 +0000 |
commit | 870b7e572dab611717acf7d2b0150cbb549c1b78 (patch) | |
tree | d92db233d0dd6f17d20abe74ac8e80eddfcb6339 /cdr | |
parent | cfb6e8df353ffd5f438c28c63152924aead62e89 (diff) |
Merged revisions 288637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r288637 | tilghman | 2010-09-23 22:36:01 -0500 (Thu, 23 Sep 2010) | 9 lines
Merged revisions 288636 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r288636 | tilghman | 2010-09-23 22:20:24 -0500 (Thu, 23 Sep 2010) | 2 lines
Solaris compatibility fixes
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288638 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
-rw-r--r-- | cdr/cdr_pgsql.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index ee5842d15..61bd4c8e5 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -111,7 +111,11 @@ static int pgsql_log(struct ast_cdr *cdr) if (PQstatus(conn) != CONNECTION_BAD) { connected = 1; if (PQsetClientEncoding(conn, encoding)) { +#ifdef HAVE_PGSQL_pg_encoding_to_char ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default '%s'\n", encoding, pg_encoding_to_char(PQclientEncoding(conn))); +#else + ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default.\n", encoding); +#endif } } else { pgerror = PQerrorMessage(conn); @@ -486,7 +490,11 @@ static int config_module(int reload) ast_debug(1, "Successfully connected to PostgreSQL database.\n"); connected = 1; if (PQsetClientEncoding(conn, encoding)) { +#ifdef HAVE_PGSQL_pg_encoding_to_char ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default '%s'\n", encoding, pg_encoding_to_char(PQclientEncoding(conn))); +#else + ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default.\n", encoding); +#endif } version = PQserverVersion(conn); |