From d7d80e703fee2f07ecda7a317e72020e2191549c Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 10 Mar 2021 12:27:14 -0700 Subject: [PATCH] Use HAVE_STDINT_H instead of trying to guess based on __STDC_VERSION__. Fixes compilation with pre-C99 headers when the compiler supports C99. --- plugins/sudoers/Makefile.in | 4 ++-- plugins/sudoers/gram.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 165f9337e..f2bb38ea9 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -439,7 +439,7 @@ $(devdir)/gram.c $(devdir)/gram.h: $(srcdir)/gram.y prologue else \ gram_y="$(srcdir)/gram.y"; \ fi; \ - cmd='$(YACC) -d -p sudoers '"$$gram_y"'; cp prologue $(devdir)/gram.c; $(SED) "s/^\\(#line .*\\) \"y\\.tab\\.c\"/\1 \"gram.c\"/" y.tab.c >> $(devdir)/gram.c; rm -f y.tab.c; mv -f y.tab.h $(devdir)/gram.h'; \ + cmd='$(YACC) -d -p sudoers '"$$gram_y"'; cp prologue $(devdir)/gram.c; $(SED) -e "s/^\\(#line .*\\) \"y\\.tab\\.c\"/\1 \"gram.c\"/" -e "/^# *include /{N;s/__STDC_VERSION__ && 199901 <= __STDC_VERSION__/HAVE_STDINT_H/;}" y.tab.c >> $(devdir)/gram.c; rm -f y.tab.c; mv -f y.tab.h $(devdir)/gram.h'; \ echo "$$cmd"; eval $$cmd; \ fi @@ -462,7 +462,7 @@ $(devdir)/getdate.c: $(srcdir)/getdate.y prologue else \ getdate_y="$(srcdir)/getdate.y"; \ fi; \ - cmd='$(YACC) '"$$getdate_y"'; cp prologue $(devdir)/getdate.c; $(SED) "s/^\\(#line .*\\) \"y\\.tab\\.c\"/\1 \"getdate.c\"/" y.tab.c >> $(devdir)/getdate.c; rm -f y.tab.c'; \ + cmd='$(YACC) '"$$getdate_y"'; cp prologue $(devdir)/getdate.c; $(SED) -e "s/^\\(#line .*\\) \"y\\.tab\\.c\"/\1 \"getdate.c\"/" -e "/^# *include /{N;s/__STDC_VERSION__ && 199901 <= __STDC_VERSION__/HAVE_STDINT_H/;}" y.tab.c >> $(devdir)/getdate.c; rm -f y.tab.c'; \ echo "$$cmd"; eval $$cmd; \ fi diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c index 6ee1171cf..2f48e9616 100644 --- a/plugins/sudoers/gram.c +++ b/plugins/sudoers/gram.c @@ -488,7 +488,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; #ifndef __PTRDIFF_MAX__ # include /* INFRINGES ON USER NAME SPACE */ -# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# if defined HAVE_STDINT_H # include /* INFRINGES ON USER NAME SPACE */ # define YY_STDINT_H # endif