From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 4CC2638582AC; Thu, 16 Mar 2023 12:54:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CC2638582AC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678971291; bh=hS+LTaQzb5IXGxFBxyh7Ig0WvstfrXbXHlYonL2hqkE=; h=From:To:Subject:Date:From; b=Z9axpQ3g7DitfSfOaUkG6Q+oZ1DAWTtChHd7NgTcJsXLdhderDa/ROKoyNz+2OYpb 25MRZsKgDSF9GaqOrMxkEbHclW/zrw4kn3l1aXpXj41K52sjLl2S1HV/bC2O3P9Unx 23GLsgeUI7FSJtZ16jry8BAvcDr10SzuL/laUk38= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: regex: fix build errors X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 24f34edc2a5dc09687c0efe7973b0db4a959dbb1 X-Git-Newrev: 988c304ec253958759658d0bf5d03a36e6971b94 Message-Id: <20230316125451.4CC2638582AC@sourceware.org> Date: Thu, 16 Mar 2023 12:54:51 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D988c304ec25= 3958759658d0bf5d03a36e6971b94 commit 988c304ec253958759658d0bf5d03a36e6971b94 Author: Corinna Vinschen AuthorDate: Thu Mar 16 11:20:11 2023 +0100 Commit: Corinna Vinschen CommitDate: Thu Mar 16 12:50:08 2023 +0100 Cygwin: regex: fix build errors =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/regex/regcomp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c index 6b7ddf5d0b88..7e9f5a50f21a 100644 --- a/winsup/cygwin/regex/regcomp.c +++ b/winsup/cygwin/regex/regcomp.c @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include "collate.h" #endif =20 +#include "winsup.h" #include "utils.h" #include "regex2.h" =20 @@ -932,7 +933,7 @@ p_simp_re(struct parse *p, struct branchc *bc) * appears otherwise. */ (void)REQUIRE(bc->nchain =3D=3D 0, REG_BADRPT); - /* FALLTHROUGH */ + fallthrough; default: if (p->error !=3D 0) return (false); /* Definitely not $... */ @@ -1170,13 +1171,13 @@ p_b_pseudoclass(struct parse *p, char c) { switch (c) { case 'W': cs->invert =3D 1; - /* PASSTHROUGH */ + fallthrough; case 'w': p_b_cclass_named(p, cs, "alnum"); break; case 'S': cs->invert =3D 1; - /* PASSTHROUGH */ + fallthrough; case 's': p_b_cclass_named(p, cs, "space"); break; @@ -1854,7 +1855,7 @@ findmust(struct parse *p, struct re_guts *g) * UTF-8 (see RFC 3629). */ if (MB_CUR_MAX > 1 && - strcmp(_CurrentRuneLocale->__encoding, "UTF-8") !=3D 0) + strcmp(__current_locale_charset (), "UTF-8") !=3D 0) return; =20 /* find the longest OCHAR sequence in strip */ @@ -1893,7 +1894,7 @@ findmust(struct parse *p, struct re_guts *g) return; } } while (OP(s) !=3D (sop)O_QUEST && OP(s) !=3D (sop)O_CH); - /* FALLTHROUGH */ + fallthrough; case OBOW: /* things that break a sequence */ case OEOW: case OBOL: