Module Name: src
Committed By: christos
Date: Thu Feb 25 13:42:16 UTC 2021
Modified Files:
src/lib/libc/regex: regcomp.c
Log Message:
protect MIN from re-definition
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/lib/libc/regex/regcomp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/regex/regcomp.c
diff -u src/lib/libc/regex/regcomp.c:1.40 src/lib/libc/regex/regcomp.c:1.41
--- src/lib/libc/regex/regcomp.c:1.40 Wed Feb 24 13:13:21 2021
+++ src/lib/libc/regex/regcomp.c Thu Feb 25 08:42:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: regcomp.c,v 1.40 2021/02/24 18:13:21 christos Exp $ */
+/* $NetBSD: regcomp.c,v 1.41 2021/02/25 13:42:16 christos Exp $ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
@@ -47,7 +47,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.40 2021/02/24 18:13:21 christos Exp $");
+__RCSID("$NetBSD: regcomp.c,v 1.41 2021/02/25 13:42:16 christos Exp $");
#define _OPENBSD_SOURCE
#define REGEX_GNU_EXTENSIONS
@@ -218,7 +218,9 @@ static char nuls[10]; /* place to point
#define DROP(n) (p->slen -= (n))
/* Macro used by computejump()/computematchjump() */
+#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
static int /* 0 success, otherwise REG_something */
regcomp_internal(regex_t * __restrict preg,
