From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Sat, 21 May 2011 05:09:09 +0000 (+0000)
Subject: Solaris compatibility fixes
X-Git-Tag: 1.4.42-rc2~3^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b92393f6c61a2ccbc67907e4c18b7556cb253e94;p=thirdparty%2Fasterisk.git

Solaris compatibility fixes


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@320393 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 2e60d9c6a7..9213b3a1eb 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -86,7 +86,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);
@@ -298,7 +302,11 @@ static int process_my_load_module(struct ast_config *cfg)
 			ast_log(LOG_DEBUG, "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
 		}
 	} else {
 		pgerror = PQerrorMessage(conn);