diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-10-18 17:00:07 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-10-18 17:04:10 +0200 |
| commit | 58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec (patch) | |
| tree | 0aea307f4cf761952fbdf15fd67fc3b09b43707c /wcsmbs/wcrtomb.c | |
| parent | 88f4b6929c26f9240a4b0b7dcc62922f02544a09 (diff) | |
| download | glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.zip glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.tar.gz glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.tar.bz2 | |
Use PTR_MANGLE and PTR_DEMANGLE unconditionally in C sources
In the future, this will result in a compilation failure if the
macros are unexpectedly undefined (due to header inclusion ordering
or header inclusion missing altogether).
Assembler sources are more difficult to convert. In many cases,
they are hand-optimized for the mangling and no-mangling variants,
which is why they are not converted.
sysdeps/s390/s390-32/__longjmp.c and sysdeps/s390/s390-64/__longjmp.c
are special: These are C sources, but most of the implementation is
in assembler, so the PTR_DEMANGLE macro has to be undefined in some
cases, to match the assembler style.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'wcsmbs/wcrtomb.c')
| -rw-r--r-- | wcsmbs/wcrtomb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index 42690f2..b71ca79 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -63,10 +63,8 @@ __wcrtomb_internal (char *s, wchar_t wc, mbstate_t *ps, size_t s_size) /* Get the conversion functions. */ fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE)); __gconv_fct fct = fcts->tomb->__fct; -#ifdef PTR_DEMANGLE if (fcts->tomb->__shlib_handle != NULL) PTR_DEMANGLE (fct); -#endif /* If WC is the NUL character we write into the output buffer the byte sequence necessary for PS to get into the initial state, followed |