commit e056be4b4ed6822df93ce46f936861a72e0e961c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 20 14:20:31 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 20 14:20:31 2024 -0800
tree 581341ef9c35f7ceb0f2e9957db0396f44a18e09
parent 96068a44d341053cc0c0ba3cbca23dd481fe5be3
parent b48087f8054372437748f21f86a63e9c077d4ede

Merge "regex: avoid a namespace collision with C23 <float.h>." into main

libc/upstream-netbsd/lib/libc/regex/utils.h

diff --git a/libc/upstream-netbsd/lib/libc/regex/utils.h b/libc/upstream-netbsd/lib/libc/regex/utils.h
index 972f555..8650dd4 100644
--- a/libc/upstream-netbsd/lib/libc/regex/utils.h
+++ b/libc/upstream-netbsd/lib/libc/regex/utils.h
@@ -63,6 +63,7 @@
 
 /* utility definitions */
 #define	DUPMAX		_POSIX2_RE_DUP_MAX	/* xxx is this right? */
+#undef INFINITY // Android-added: avoid collision with C23 <float.h> INFINITY (via <limits.h>)
 #define	INFINITY	(DUPMAX + 1)
 
 #define	NC_MAX		(CHAR_MAX - CHAR_MIN + 1)