commit 75f7acc83afaef0bfb8b2f803cb7484597f67a8b
author Michael Ow <mow@svn.icu-project.org> Thu Feb 14 06:59:02 2013 +0000
committer Michael Ow <mow@svn.icu-project.org> Thu Feb 14 06:59:02 2013 +0000
tree 8419021a703743df4552f98702e751b3e7fa418f
parent a25b4c0c19d7a58d8c55841878b043631703f2c0

ICU-9358 merge into 49.x r33212 for ICU-9912 fix default timezone detection on Solaris

X-SVN-Rev: 33214

source/common/putil.cpp

diff --git a/source/common/putil.cpp b/source/common/putil.cpp
index 0f22a09..b3f75d5 100644
--- a/source/common/putil.cpp
+++ b/source/common/putil.cpp
@@ -100,12 +100,13 @@
 #elif U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED || U_PLATFORM == U_PF_BSD || U_PLATFORM == U_PF_SOLARIS
 #   include <limits.h>
 #   include <unistd.h>
+#   if U_PLATFORM == U_PF_SOLARIS
+#       ifndef _XPG4_2
+#           define _XPG4_2
+#       endif
+#   endif
 #elif U_PLATFORM == U_PF_QNX
 #   include <sys/neutrino.h>
-#elif U_PLATFORM == U_PF_SOLARIS
-#   ifndef _XPG4_2
-#       define _XPG4_2
-#   endif
 #endif
 
 #if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)