summaryrefslogtreecommitdiff
path: root/Build/source/libs/icu/icu-PATCHES/patch-16-putil
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/icu/icu-PATCHES/patch-16-putil')
-rw-r--r--Build/source/libs/icu/icu-PATCHES/patch-16-putil12
1 files changed, 6 insertions, 6 deletions
diff --git a/Build/source/libs/icu/icu-PATCHES/patch-16-putil b/Build/source/libs/icu/icu-PATCHES/patch-16-putil
index 152873a20d3..c79c526dc9c 100644
--- a/Build/source/libs/icu/icu-PATCHES/patch-16-putil
+++ b/Build/source/libs/icu/icu-PATCHES/patch-16-putil
@@ -1,6 +1,5 @@
-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
+--- source/common/putil.cpp (revision 40154)
++++ source/common/putil.cpp (working copy)
@@ -41,6 +41,20 @@
// Must be before any other #includes.
#include "uposixdefs.h"
@@ -22,7 +21,7 @@ diff -ur -N -x config.guess -x config.sub -x install-sh icu-56.1.orig/source/com
/* include ICU headers */
#include "unicode/utypes.h"
#include "unicode/putil.h"
-@@ -102,20 +116,6 @@
+@@ -102,21 +116,7 @@
# include <sys/neutrino.h>
#endif
@@ -31,7 +30,7 @@ diff -ur -N -x config.guess -x config.sub -x install-sh icu-56.1.orig/source/com
-#undef __STRICT_ANSI__
-#endif
-
--/*
+ /*
- * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement.
- */
-#include <time.h>
@@ -40,6 +39,7 @@ diff -ur -N -x config.guess -x config.sub -x install-sh icu-56.1.orig/source/com
-#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.
+ *