summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch')
-rw-r--r--meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch28
1 files changed, 15 insertions, 13 deletions
diff --git a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
index add0d765b7..0c61893d7c 100644
--- a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
+++ b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
@@ -1,31 +1,33 @@
1From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001 1From d6b57c1b4eb9a24d9d95342a961c93946539c93b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 24 Jun 2017 22:52:40 -0700 3Date: Sat, 24 Jun 2017 22:52:40 -0700
4Subject: [PATCH] i18n: Drop include <xlocale.h> 4Subject: [PATCH 3/4] i18n: Drop include <xlocale.h>
5 5
6glibc 2.26 drops this header 6glibc 2.26 drops this header
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11 9
12 i18n/digitlst.cpp | 6 +----- 10---
11 source/i18n/digitlst.cpp | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-) 12 1 file changed, 1 insertion(+), 5 deletions(-)
14 13
15Index: source/i18n/digitlst.cpp 14diff --git a/source/i18n/digitlst.cpp b/source/i18n/digitlst.cpp
16=================================================================== 15index 8e86fa7..0bdbb2c 100644
17--- source.orig/i18n/digitlst.cpp 16--- a/i18n/digitlst.cpp
18+++ source/i18n/digitlst.cpp 17+++ b/i18n/digitlst.cpp
19@@ -61,11 +61,7 @@ 18@@ -62,11 +62,7 @@
20 #endif 19 #endif
21 20
22 #if U_USE_STRTOD_L 21 #if U_USE_STRTOD_L
23-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN 22-# if U_HAVE_XLOCALE_H
24-# include <locale.h>
25-# else
26-# include <xlocale.h> 23-# include <xlocale.h>
24-# else
25-# include <locale.h>
27-# endif 26-# endif
28+# include <locale.h> 27+# include <locale.h>
29 #endif 28 #endif
30 29
31 // *************************************************************************** 30 // ***************************************************************************
31--
322.14.2
33