From a0468760ffa9f7843bbd0d6cf60685f63d33b600 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Mon, 1 Nov 2021 13:36:43 +0000
Subject: [PATCH] maint: fix recent syntax-check failures

* cfg.mk (exclude_file_name_regexp--sc_system_h_headers):
Add chown-core.h to the regexp, to better decouple from system.h.
* src/env.c: Remove minmax.h include already included in system.h.
* src/libstdbuf.c: Likewise.
* src/prog-fprintf.h: Remove doubled semicolon.
---
 cfg.mk             | 2 +-
 src/env.c          | 1 -
 src/libstdbuf.c    | 1 -
 src/prog-fprintf.h | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index ccd591e7d3..6d6c37dc2d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -839,7 +839,7 @@ exclude_file_name_regexp--sc_bindtextdomain = \
 exclude_file_name_regexp--sc_trailing_blank = \
   ^(tests/pr/|gl/.*\.diff$$|man/help2man)
 exclude_file_name_regexp--sc_system_h_headers = \
-  ^src/((die|system|copy|find-mount-point)\.h|make-prime-list\.c)$$
+  ^src/((die|system|copy|chown-core|find-mount-point)\.h|make-prime-list\.c)$$
 
 _src = (crctab|false|lbracket|ls-(dir|ls|vdir)|tac-pipe|uname-(arch|uname))
 _gl_src = (xdecto.max|cl-strtold)
diff --git a/src/env.c b/src/env.c
index 98382a4396..96ea1f71bc 100644
--- a/src/env.c
+++ b/src/env.c
@@ -27,7 +27,6 @@
 #include "die.h"
 #include "error.h"
 #include "idx.h"
-#include "minmax.h"
 #include "operand2sig.h"
 #include "quote.h"
 #include "sig2str.h"
diff --git a/src/libstdbuf.c b/src/libstdbuf.c
index 4350b4655c..e7642aebea 100644
--- a/src/libstdbuf.c
+++ b/src/libstdbuf.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include "system.h"
-#include "minmax.h"
 
 /* Deactivate config.h's "rpl_"-prefixed definitions, since we don't
    link gnulib here, and the replacements aren't needed.  */
diff --git a/src/prog-fprintf.h b/src/prog-fprintf.h
index eb0f185e6c..a18b977dd2 100644
--- a/src/prog-fprintf.h
+++ b/src/prog-fprintf.h
@@ -20,6 +20,6 @@
 # include <stdio.h>
 
 extern void prog_fprintf (FILE *fp, char const *fmt, ...)
-  _GL_ATTRIBUTE_FORMAT ((__printf__, 2, 3)) _GL_ATTRIBUTE_NONNULL ((1, 2));;
+  _GL_ATTRIBUTE_FORMAT ((__printf__, 2, 3)) _GL_ATTRIBUTE_NONNULL ((1, 2));
 
 #endif
-- 
2.47.2