ICU-12766 z and AIX porting: C++11 issue and icu-config issue for escaping

X-SVN-Rev: 39931

diff --git a/icu4c/source/common/listformatter.cpp b/icu4c/source/common/listformatter.cpp
index a0ab80a4905fddd6fcd9311e629242cc0477ca97..d105654755fd1e5a96fa7c157270baeb71ec7402 100644 (file)
--- a/icu4c/source/common/listformatter.cpp
+++ b/icu4c/source/common/listformatter.cpp
@@ -170,9 +170,16 @@ enum {
 
 struct ListFormatter::ListPatternsSink : public ResourceSink {
     UnicodeString two, start, middle, end;
+#if ((U_PLATFORM == U_PF_AIX) || (U_PLATFORM == U_PF_OS390)) && (U_CPLUSPLUS_VERSION < 11)
+    char aliasedStyle[kStyleLenMax+1];
+    ListPatternsSink() {
+      uprv_memset(aliasedStyle, 0, kStyleLenMax+1);
+    }
+#else
     char aliasedStyle[kStyleLenMax+1] = {0};
 
     ListPatternsSink() {}
+#endif
     virtual ~ListPatternsSink();
 
     void setAliasedStyle(UnicodeString alias) {

diff --git a/icu4c/source/config/make2sh.sed b/icu4c/source/config/make2sh.sed
index df53e4e520c7f3b500b383cd19168e73f415bcca..783e6a199e8a8f88b56b12f9111134becb052d96 100644 (file)
--- a/icu4c/source/config/make2sh.sed
+++ b/icu4c/source/config/make2sh.sed
@@ -4,6 +4,7 @@
 s%^\([a-zA-Z0-9\._-]*\)[       ]*+=%\1=$(\1) %
 s%^[A-Z]*_SO_TARG*%## &%
 s%^SHARED_OBJECT.*%## &%
+s%^_%.*%## &%
 s%^LD_SONAME.*%## &%
 s%$(\([^\)]*\))%${\1}%g
 s%^    %#M#    %