diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-13 23:56:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-13 23:56:43 +0000 |
commit | cc3e5cdc35b4df9130561775387bd2f56f458bba (patch) | |
tree | b4180e75faecd437fa1c1cd6e77cb67e29554702 /Build/source/libs/icu/icu-src/source/common/putil.cpp | |
parent | c1d91990fc364cd59b82fa33adab656e4374448e (diff) |
icu 58.2, changes for TL
git-svn-id: svn://tug.org/texlive/trunk@43492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/common/putil.cpp')
-rw-r--r-- | Build/source/libs/icu/icu-src/source/common/putil.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Build/source/libs/icu/icu-src/source/common/putil.cpp b/Build/source/libs/icu/icu-src/source/common/putil.cpp index 03f6548689d..abf2aac830f 100644 --- a/Build/source/libs/icu/icu-src/source/common/putil.cpp +++ b/Build/source/libs/icu/icu-src/source/common/putil.cpp @@ -43,6 +43,20 @@ // Must be before any other #includes. #include "uposixdefs.h" +#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__) +/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */ +#undef __STRICT_ANSI__ +#endif + +/* + * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement. + */ +#include <time.h> + +#if !U_PLATFORM_USES_ONLY_WIN32_API +#include <sys/time.h> +#endif + /* include ICU headers */ #include "unicode/utypes.h" #include "unicode/putil.h" @@ -104,20 +118,6 @@ # include <sys/neutrino.h> #endif -#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__) -/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */ -#undef __STRICT_ANSI__ -#endif - -/* - * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement. - */ -#include <time.h> - -#if !U_PLATFORM_USES_ONLY_WIN32_API -#include <sys/time.h> -#endif - /* * Only include langinfo.h if we have a way to get the codeset. If we later * depend on more feature, we can test on U_HAVE_NL_LANGINFO. |