From a3e881de9a83334c7254c6b660780d1f7cad9b0e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 18 Jul 2023 20:33:41 -0700 Subject: [PATCH] mbiterf, mbuiterf: port to strict C17 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I ran into this problem on NetBSD 9.3. * lib/mbiterf.h (mbiterf_next) [!GNULIB_MBRTOC32_REGULAR]: * lib/mbuiterf.h (mbuiterf_next) [!GNULIB_MBRTOC32_REGULAR]: Don’t label a declaration. --- ChangeLog | 8 ++++++++ lib/mbiterf.h | 2 +- lib/mbuiterf.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b0079d8d0..393da435f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-07-18 Paul Eggert + + mbiterf, mbuiterf: port to strict C17 + I ran into this problem on NetBSD 9.3. + * lib/mbiterf.h (mbiterf_next) [!GNULIB_MBRTOC32_REGULAR]: + * lib/mbuiterf.h (mbuiterf_next) [!GNULIB_MBRTOC32_REGULAR]: + Don’t label a declaration. + 2023-07-18 Bruno Haible mbiter, mbiterf, mbuiter, mbuiterf: Force inlining with clang. diff --git a/lib/mbiterf.h b/lib/mbiterf.h index 4ea1500210..dea6aaef58 100644 --- a/lib/mbiterf.h +++ b/lib/mbiterf.h @@ -128,7 +128,7 @@ mbiterf_next (struct mbif_state *ps, const char *iter, const char *endptr) assert (mbsinit (&ps->state)); #if !GNULIB_MBRTOC32_REGULAR ps->in_shift = true; - with_shift: + with_shift:; #endif size_t bytes; char32_t wc; diff --git a/lib/mbuiterf.h b/lib/mbuiterf.h index 43d257e549..85c53e73ac 100644 --- a/lib/mbuiterf.h +++ b/lib/mbuiterf.h @@ -138,7 +138,7 @@ mbuiterf_next (struct mbuif_state *ps, const char *iter) assert (mbsinit (&ps->state)); #if !GNULIB_MBRTOC32_REGULAR ps->in_shift = true; - with_shift: + with_shift:; #endif size_t bytes; char32_t wc; -- 2.39.5