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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
From f0c62653bbcf68291a7dd621db367a9fef666183 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 24 Jan 2021 15:27:14 -0800
Subject: [PATCH 3/3] libc: Expose wchar stdio prototypes even for TINY_STDIO
This makes libstdc++ happy when wrapping these names, even though they
aren't actually available for appplications.
Signed-off-by: Keith Packard <keithp@keithp.com>
---
newlib/libc/include/wchar.h | 39 +++++++++++++++++++------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index 8a9c4b0fe..5dc3af93c 100644
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -217,8 +217,6 @@ float wcstof_l (const wchar_t *, wchar_t **, locale_t);
long double wcstold_l (const wchar_t *, wchar_t **, locale_t);
#endif
-#ifndef TINY_STDIO
-
wint_t fgetwc (__FILE *);
wchar_t *fgetws (wchar_t *__restrict, int, __FILE *__restrict);
wint_t fputwc (wchar_t, __FILE *);
@@ -232,6 +230,8 @@ wint_t putwc (wchar_t, __FILE *);
wint_t putwchar (wchar_t);
wint_t ungetwc (wint_t wc, __FILE *);
+#ifndef TINY_STDIO
+
struct _reent;
wint_t _fgetwc_r (struct _reent *, __FILE *);
@@ -253,6 +253,24 @@ wint_t _putwchar_r (struct _reent *, wchar_t);
wint_t _putwchar_unlocked_r (struct _reent *, wchar_t);
wint_t _ungetwc_r (struct _reent *, wint_t wc, __FILE *);
+int _fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...);
+int _swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...);
+int _vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, va_list);
+int _vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, va_list);
+int _vwprintf_r (struct _reent *, const wchar_t *, va_list);
+int _wprintf_r (struct _reent *, const wchar_t *, ...);
+
+int _fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...);
+int _swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...);
+int _vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, va_list);
+int _vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, va_list);
+int _vwscanf_r (struct _reent *, const wchar_t *, va_list);
+int _wscanf_r (struct _reent *, const wchar_t *, ...);
+
+__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *);
+
+#endif
+
#if __GNU_VISIBLE
wint_t fgetwc_unlocked (__FILE *);
wchar_t *fgetws_unlocked (wchar_t *__restrict, int, __FILE *__restrict);
@@ -267,7 +285,6 @@ wint_t putwchar_unlocked (wchar_t);
#if __POSIX_VISIBLE >= 200809
__FILE *open_wmemstream (wchar_t **, size_t *);
#endif
-__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *);
#if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
int fwprintf (__FILE *__restrict, const wchar_t *__restrict, ...);
@@ -281,13 +298,6 @@ int vwprintf (const wchar_t *__restrict, va_list);
int wprintf (const wchar_t *__restrict, ...);
#endif
-int _fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...);
-int _swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...);
-int _vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, va_list);
-int _vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, va_list);
-int _vwprintf_r (struct _reent *, const wchar_t *, va_list);
-int _wprintf_r (struct _reent *, const wchar_t *, ...);
-
#if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
int fwscanf (__FILE *__restrict, const wchar_t *__restrict, ...);
int swscanf (const wchar_t *__restrict,
@@ -300,13 +310,6 @@ int vwscanf (const wchar_t *__restrict, va_list);
int wscanf (const wchar_t *__restrict, ...);
#endif
-int _fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...);
-int _swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...);
-int _vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, va_list);
-int _vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, va_list);
-int _vwscanf_r (struct _reent *, const wchar_t *, va_list);
-int _wscanf_r (struct _reent *, const wchar_t *, ...);
-
#define getwc(fp) fgetwc(fp)
#define putwc(wc,fp) fputwc((wc), (fp))
#define getwchar() fgetwc(stdin)
@@ -319,8 +322,6 @@ int _wscanf_r (struct _reent *, const wchar_t *, ...);
#define putwchar_unlocked(wc) fputwc_unlocked((wc), stdout)
#endif
-#endif /* !TINY_STDIO */
-
_END_STD_C
#if __SSP_FORTIFY_LEVEL > 0
--
2.30.0
|
