blob: 9a6c2f8e907b830ca04b80d05832f627b93a8a17 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From: Bernhard Walle <bernhard@bwalle.de>
Date: Mon, 2 Oct 2017 16:55:23 +0200
Subject: [PATCH] Don't include <xlocale.h>
This header has been removed in glibc 2.26:
https://abi-laboratory.pro/tracker/changelog/glibc/2.26/log.html
------------------------ >8 ------------------------
* The nonstandard header <xlocale.h> has been removed. Most programs should
use <locale.h> instead. If you have a specific need for the definition of
locale_t with no other declarations, please contact
libc-alpha@sourceware.org and explain.
------------------------ 8< ------------------------
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Upstream: https://git.pengutronix.de/cgit/ptxdist/tree/patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
eglibc/locale/langinfo.h | 2 +-
eglibc/locale/locale.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eglibc/locale/langinfo.h b/eglibc/locale/langinfo.h
index 0a5336507196..76707a4584c1 100644
--- a/eglibc/locale/langinfo.h
+++ b/eglibc/locale/langinfo.h
@@ -589,7 +589,7 @@ extern char *nl_langinfo (nl_item __item) __THROW;
more information. */
/* Get locale datatype definition. */
-# include <xlocale.h>
+# include <locale.h>
/* Just like nl_langinfo but get the information from the locale object L. */
extern char *nl_langinfo_l (nl_item __item, __locale_t __l);
diff --git a/eglibc/locale/locale.h b/eglibc/locale/locale.h
index 2aa19e76acb2..18be711a2d40 100644
--- a/eglibc/locale/locale.h
+++ b/eglibc/locale/locale.h
@@ -143,7 +143,7 @@ __END_NAMESPACE_STD
This is a proof-of-concept implementation. */
/* Get locale datatype definition. */
-# include <xlocale.h>
+# include_next <locale.h>
/* Return a reference to a data structure representing a set of locale
datasets. Unlike for the CATEGORY parameter for `setlocale' the
|
