From 39f698cbc3f44ff9519be7f24e4a1f0a81dcdf81 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Fri, 11 Sep 2015 02:01:12 +0000
Subject: [PATCH] ICU-11437 revert r37938 r37939 (also ICU-11435 ) - try to
 unbreak Solaris

X-SVN-Rev: 37945
---
 icu4c/source/acinclude.m4        | 2 +-
 icu4c/source/common/uposixdefs.h | 4 ----
 icu4c/source/configure           | 4 ++--
 icu4c/source/configure.ac        | 2 +-
 icu4c/source/runConfigureICU     | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/icu4c/source/acinclude.m4 b/icu4c/source/acinclude.m4
index 454affe5445..b64e984b6c3 100644
--- a/icu4c/source/acinclude.m4
+++ b/icu4c/source/acinclude.m4
@@ -57,7 +57,7 @@ x86_64-*-cygwin)
 		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
 		esac
 	fi ;;
-*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) 	icu_cv_host_frag=mh-bsd-gcc ;;
+*-*-*bsd*|*-*-dragonfly*) 	icu_cv_host_frag=mh-bsd-gcc ;;
 *-*-aix*)
 	if test "$GCC" = yes; then
 		icu_cv_host_frag=mh-aix-gcc
diff --git a/icu4c/source/common/uposixdefs.h b/icu4c/source/common/uposixdefs.h
index a75d5130f9b..ca84fefad1e 100644
--- a/icu4c/source/common/uposixdefs.h
+++ b/icu4c/source/common/uposixdefs.h
@@ -42,10 +42,8 @@
      * and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__.
      * In C++ source code (e.g., putil.cpp), __STDC_VERSION__ is not defined at all.
      */
-#if !defined(_SCO_DS)
 #   define _XOPEN_SOURCE 600
 #endif
-#endif
 
 /*
  * Make sure things like readlink and such functions work.
@@ -54,11 +52,9 @@
  *
  * z/OS needs this definition for timeval and to get usleep.
  */
-#if !defined(__sun) && !defined(_SCO_DS)
 #if !defined(_XOPEN_SOURCE_EXTENDED)
 #   define _XOPEN_SOURCE_EXTENDED 1
 #endif
-#endif
 
 /*
  * There is an issue with turning on _XOPEN_SOURCE_EXTENDED on certain platforms.
diff --git a/icu4c/source/configure b/icu4c/source/configure
index 2e3fdb18fb3..7190d41c8eb 100755
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -5174,7 +5174,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
 		esac
 	fi ;;
-*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) 	icu_cv_host_frag=mh-bsd-gcc ;;
+*-*-*bsd*|*-*-dragonfly*) 	icu_cv_host_frag=mh-bsd-gcc ;;
 *-*-aix*)
 	if test "$GCC" = yes; then
 		icu_cv_host_frag=mh-aix-gcc
@@ -7729,7 +7729,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
 case "${host}" in
 	*-*-solaris*) 	platform=U_SOLARIS ;;
 	*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu)        platform=U_LINUX ;;
-	*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) 	platform=U_BSD ;;
+	*-*-*bsd*|*-*-dragonfly*) 	platform=U_BSD ;;
 	*-*-aix*) 	platform=U_AIX ;;
 	*-*-hpux*) 	platform=U_HPUX ;;
 	*-apple-darwin*|*-apple-rhapsody*)	platform=U_DARWIN ;;
diff --git a/icu4c/source/configure.ac b/icu4c/source/configure.ac
index 8fd98bb277e..595bd122cee 100644
--- a/icu4c/source/configure.ac
+++ b/icu4c/source/configure.ac
@@ -1251,7 +1251,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
 case "${host}" in
 	*-*-solaris*) 	platform=U_SOLARIS ;;
 	*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu)        platform=U_LINUX ;;
-	*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) 	platform=U_BSD ;;
+	*-*-*bsd*|*-*-dragonfly*) 	platform=U_BSD ;;
 	*-*-aix*) 	platform=U_AIX ;;
 	*-*-hpux*) 	platform=U_HPUX ;;
 	*-apple-darwin*|*-apple-rhapsody*)	platform=U_DARWIN ;;
diff --git a/icu4c/source/runConfigureICU b/icu4c/source/runConfigureICU
index d6e6a2305f1..9cd1e91487a 100755
--- a/icu4c/source/runConfigureICU
+++ b/icu4c/source/runConfigureICU
@@ -327,7 +327,7 @@ case $platform in
         DEBUG_CXXFLAGS='-Zi -MDd'
         DEBUG_LDFLAGS='-DEBUG'
         ;;
-    *BSD | DragonFly | Bitrig)
+    *BSD)
         THE_OS="BSD"
         THE_COMP="the GNU C++"
         DEBUG_CFLAGS='-g -O0'