]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Solaris compatibility fixes
authorPaul Belanger <paul.belanger@polybeacon.com>
Sat, 21 May 2011 05:09:09 +0000 (05:09 +0000)
committerPaul Belanger <paul.belanger@polybeacon.com>
Sat, 21 May 2011 05:09:09 +0000 (05:09 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@320393 65c4cc65-6c06-0410-ace0-fbb531ad65f3

cdr/cdr_pgsql.c

index 2e60d9c6a7fcdf59caf1c65116ae109fedf61dc4..9213b3a1eb6bb937f7f73b7363228f0086d9dd69 100644 (file)
@@ -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);