Merge "Sync upstream NetBSD." into main am: 87e7955d9f
am: 13c835abfc
am: 7e6c5caa32
am: 993e2bc0b2
am: 278f991c65
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2666315 Change-Id: I921c8e37082059c4f845cb7abfb71bf7be498d0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
4b05100dc0
1 changed files with 2 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: regcomp.c,v 1.46 2021/03/11 15:00:29 christos Exp $ */
|
||||
/* $NetBSD: regcomp.c,v 1.47 2022/12/21 17:44:15 wiz Exp $ */
|
||||
|
||||
/*-
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
|
@ -51,9 +51,7 @@
|
|||
static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94";
|
||||
__FBSDID("$FreeBSD: head/lib/libc/regex/regcomp.c 368359 2020-12-05 03:18:48Z kevans $");
|
||||
#endif
|
||||
__RCSID("$NetBSD: regcomp.c,v 1.46 2021/03/11 15:00:29 christos Exp $");
|
||||
|
||||
#define _OPENBSD_SOURCE
|
||||
__RCSID("$NetBSD: regcomp.c,v 1.47 2022/12/21 17:44:15 wiz Exp $");
|
||||
|
||||
#ifndef LIBHACK
|
||||
#define REGEX_GNU_EXTENSIONS
|
||||
|
|
Loading…
Reference in a new issue