From d358980e89c1e6171e5b77143075f56bd0dd4d56 Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Thu, 16 May 2013 14:43:26 +0000
Subject: [PATCH] ICU-10169 Remove error compilation options in zos build

X-SVN-Rev: 33667
---
 icu4c/source/common/umapfile.c | 5 ++++-
 icu4c/source/config/mh-os390   | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/icu4c/source/common/umapfile.c b/icu4c/source/common/umapfile.c
index 05caecfff2c..ce4ee023feb 100644
--- a/icu4c/source/common/umapfile.c
+++ b/icu4c/source/common/umapfile.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1999-2011, International Business Machines
+*   Copyright (C) 1999-2013, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************/
@@ -15,6 +15,9 @@
  *         wrapper functions.
  *
  *----------------------------------------------------------------------------*/
+/* Defines _XOPEN_SOURCE for access to POSIX functions.
+ * Must be before any other #includes. */
+#include "uposixdefs.h"
 
 #include "unicode/putil.h"
 #include "udatamem.h"
diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390
index 4c36656857f..74bd749e844 100644
--- a/icu4c/source/config/mh-os390
+++ b/icu4c/source/config/mh-os390
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## os/390, z/OS specific setup 
-## Copyright (c) 1999-2012, International Business Machines Corporation and
+## Copyright (c) 1999-2013, International Business Machines Corporation and
 ## others. All Rights Reserved.
 
 ###################################################################
@@ -66,9 +66,8 @@ SHAREDLIBCXXFLAGS	= -Wc,expo
 # The DLL option must be used by the callee and caller code when using shared libraries.
 # NOCSECT might be used as an optimization option.
 # -+ means accept any file extension as a C++ file. By default only .C is accepted.
-CFLAGS          += -Wc,DLL,ROS,RENT,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'CHARS(SIGNED)','LANGLVL(EXTENDED)' $(ICU_IEEE)
-CXXFLAGS        += -Wc,DLL,ROS,RTTI,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'CHARS(SIGNED)','LANGLVL(EXTENDED)' $(ICU_IEEE) -+
-DEFS            += -D_XOPEN_SOURCE=600
+CFLAGS          += -Wc,DLL,ROS,RENT,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'LANGLVL(EXTENDED)' $(ICU_IEEE)
+CXXFLAGS        += -Wc,DLL,ROS,RTTI,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'LANGLVL(EXTENDED)' $(ICU_IEEE) -+
 ARFLAGS         = -cr
 
 # _MSE_PROTOS usually interacts with _XOPEN_SOURCE. It affects some standard
-- 
2.49.0