Module Name: src
Committed By: christos
Date: Thu Apr 22 19:20:25 UTC 2021
Modified Files:
src/lib/libc/regex: utils.h
Log Message:
PR/56120: Chris Pinnock: build.sh (-m alpha) release fails on current on
Darwin in libc compilation
We build the regex code in tools without nls. We don't include any nls headers
for that, but on Darwin wint_t gets defined, so we end up with a compilation
error. The cleaner fix would have been to always use regex_foo_t types, but
the minimal fix is to only do this for the tools build, using cpp.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/regex/utils.h
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/utils.h
diff -u src/lib/libc/regex/utils.h:1.8 src/lib/libc/regex/utils.h:1.9
--- src/lib/libc/regex/utils.h:1.8 Thu Feb 25 16:28:40 2021
+++ src/lib/libc/regex/utils.h Thu Apr 22 15:20:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: utils.h,v 1.8 2021/02/25 21:28:40 christos Exp $ */
+/* $NetBSD: utils.h,v 1.9 2021/04/22 19:20:24 christos Exp $ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
@@ -43,6 +43,9 @@
#include <wctype.h>
#else
#include <ctype.h>
+#define wint_t regex_wint_t
+#define mbstate_t regex_mbstate_t
+#define wctype_t regex_wctype_t
typedef short wint_t;
typedef char mbstate_t;
typedef short wctype_t;
