From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 24 Jul 2022 17:17:53 +0000 (-0700)
Subject: ast strmatch: squash -Wundef warnings
X-Git-Tag: 5.0.1~26^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55902ea3fa3321d239e10e8534f5a45983323af8;p=graphviz

ast strmatch: squash -Wundef warnings
---

diff --git a/lib/ast/strmatch.c b/lib/ast/strmatch.c
index d58edccab..ad08c551b 100644
--- a/lib/ast/strmatch.c
+++ b/lib/ast/strmatch.c
@@ -77,7 +77,7 @@ typedef struct {
     char *next_p;
 } Match_t;
 
-#if _lib_mbtowc && MB_LEN_MAX > 1
+#if defined(_lib_mbtowc) && _lib_mbtowc && MB_LEN_MAX > 1
 #define mbgetchar(p)	((ast.locale.set&AST_LC_multibyte)?((ast.tmp_int=mbtowc(&ast.tmp_wchar,p,MB_CUR_MAX))>=0?((p+=ast.tmp_int),ast.tmp_wchar):0):(*p++))
 #else
 #define mbgetchar(p)	(*p++)
@@ -466,7 +466,7 @@ onematch(Match_t * mp, int g, char *s, char *p, char *e, char *r,
 		    else if (range)
 		    {
 		      getrange:
-#if _lib_mbtowc
+#if defined(_lib_mbtowc) && _lib_mbtowc
 			if (ast.locale.set & AST_LC_multibyte) {
 			    wchar_t sw;
 			    wchar_t bw;