diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
| commit | cfd1f17f1a85d95ea12bca8dae42add7dad1ad11 (patch) | |
| tree | 8016486f8ee7157213f2d09ff2491bfa9c94638a /lib/mbrtoc32.c | |
| parent | 14e4d584d0121031ec40e6c35869745f1747ff29 (diff) | |
| parent | 1403307d6e2fb4e7b5d97a35f40d1e95134561ab (diff) | |
Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master
Diffstat (limited to 'lib/mbrtoc32.c')
| -rw-r--r-- | lib/mbrtoc32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mbrtoc32.c b/lib/mbrtoc32.c index 771c857d..f3570f73 100644 --- a/lib/mbrtoc32.c +++ b/lib/mbrtoc32.c @@ -1,5 +1,5 @@ /* Convert multibyte character to 32-bit wide character. - Copyright (C) 2020-2024 Free Software Foundation, Inc. + Copyright (C) 2020-2026 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -30,7 +30,7 @@ # include "lc-charset-unicode.h" #endif -#if GNULIB_defined_mbstate_t /* AIX, IRIX */ +#if GNULIB_defined_mbstate_t /* AIX */ /* Implement mbrtoc32() on top of mbtowc() for the non-UTF-8 locales and directly for the UTF-8 locales. */ @@ -87,7 +87,7 @@ mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps) # include <wchar.h> # include "localcharset.h" -# include "streq.h" +# include "streq-opt.h" # if MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ # include "hard-locale.h" @@ -165,7 +165,6 @@ mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps) char buf[4]; const char *p; size_t m; - int res; switch (nstate) { @@ -198,6 +197,7 @@ mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps) /* Here m > 0. */ + int res; { # define FITS_IN_CHAR_TYPE(wc) 1 # include "mbrtowc-impl-utf8.h" |