summaryrefslogtreecommitdiffstats
path: root/intl/icu
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-12-07 10:20:41 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-12-07 10:20:41 +0100
commit0fddf6e728ddea66a463e1ccd007aa9d48498905 (patch)
tree65e28a16bbfcf1747ca41a6a808136ee578735d9 /intl/icu
parent210d6a87a2759887ce286288ab0815cbd0439e5a (diff)
parent18159927e8f37a1858f9757803b20744fcfff505 (diff)
downloadUXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar
UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.gz
UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.lz
UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.xz
UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.zip
Merge branch 'release' into Pale_Moon-release
Diffstat (limited to 'intl/icu')
-rw-r--r--intl/icu/source/common/uposixdefs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intl/icu/source/common/uposixdefs.h b/intl/icu/source/common/uposixdefs.h
index 495deea49..a5b7fd09f 100644
--- a/intl/icu/source/common/uposixdefs.h
+++ b/intl/icu/source/common/uposixdefs.h
@@ -54,7 +54,7 @@
*
* z/OS needs this definition for timeval and to get usleep.
*/
-#if !defined(_XOPEN_SOURCE_EXTENDED)
+#if !defined(_XOPEN_SOURCE_EXTENDED) && (U_PLATFORM != U_PF_SOLARIS)
# define _XOPEN_SOURCE_EXTENDED 1
#endif