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

X-SVN-Rev: 33214
This commit is contained in:
Michael Ow 2013-02-14 06:59:02 +00:00
parent a25b4c0c19
commit 75f7acc83a

View file

@ -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__)