46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
diff -ur -N -x config.guess -x config.sub -x install-sh icu-56.1.orig/source/common/putil.cpp icu-56.1/source/common/putil.cpp
|
|
--- icu-56.1.orig/source/common/putil.cpp 2015-09-24 00:32:32.000000000 +0200
|
|
+++ icu-56.1/source/common/putil.cpp 2015-09-27 15:29:05.000000000 +0200
|
|
@@ -41,6 +41,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"
|
|
@@ -102,20 +116,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.
|