diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-24 03:41:02 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-24 03:41:02 +0000 |
| commit | f8180257e040e68b36ea87959598b55e46c15919 (patch) | |
| tree | 307f62f875675a52717fd0ad060a0a0bca34f4ea /cdr | |
| parent | cfe811bb358ecc9e07ba42a0508453862592e5cc (diff) | |
Merged revisions 288638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r288638 | tilghman | 2010-09-23 22:39:29 -0500 (Thu, 23 Sep 2010) | 16 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@288639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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); |