1 files changed, 22 insertions, 0 deletions
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp
index 89530b5b45b..c43a6454dd3 100644
--- a/cpp/test/Ice/stringConverter/Client.cpp
+++ b/cpp/test/Ice/stringConverter/Client.cpp
@@ -63,6 +63,28 @@ main(int argc, char* argv[])
         IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>("iso815"));
     }
     IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("ucs4"));
+    
+#elif defined(_AIX)
+    
+    // Always big-endian
+    
+    if(useLocale)
+    {
+	IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>());
+    }
+    else
+    {
+        IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>("ISO8859-15"));
+    }
+
+    if(sizeof(wchar_t) == 4)
+    {
+	IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-32"));
+    }
+    else
+    {  
+	IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-16"));
+    }    
 #else
 
     if(useLocale)