diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 03:36:01 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 03:36:01 +0000 |
| commit | a9697cb0f74cb1f50e4497bb70bf49357f0c425d (patch) | |
| tree | bf26d3bf33b276ee1626c2a888e0d32e0d0c3d46 /cdr/cdr_pgsql.c | |
| parent | fcca2ea91a02e58717221a94f46085fa2405d7c2 (diff) | |
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.6.2@288637 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr/cdr_pgsql.c')
| -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 21370944f..f469bc520 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -113,7 +113,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); @@ -489,7 +493,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); |