From 2e60ce8af12b12a8c1aed18c7bea2413016d4004 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Mon, 15 Jul 2019 05:14:32 -0400
Subject: Port to AIX with g++, xlC_r and xlclang++ (#434)

---
 cpp/test/Ice/stringConverter/Client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cpp/test/Ice/stringConverter/Client.cpp')

diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp
index bc746df14ca..e32b6e51dbe 100644
--- a/cpp/test/Ice/stringConverter/Client.cpp
+++ b/cpp/test/Ice/stringConverter/Client.cpp
@@ -55,7 +55,7 @@ Client::run(int argc, char** argv)
         narrowEncoding = "iso815";
         wideEncoding = "ucs4";
 
-#elif defined(_AIX)
+#elif defined(_AIX) && !defined(_LIBICONV_VERSION)
 
         // Always big-endian
         narrowEncoding = "ISO8859-15";
-- 
cgit v1.2.3