From: Collin Funk <collin.funk1@gmail.com>
Date: Sun, 18 Feb 2024 20:23:07 +0000 (-0800)
Subject: maint: prefer #include <...> for gnulib substitute headers
X-Git-Tag: v9.5~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=430663cb355c59f1dbebddd76283d6897f7745f8;p=thirdparty%2Fcoreutils.git

maint: prefer #include <...> for gnulib substitute headers

* src/shuf.c: Change #include "getopt.h" to #include <getopt.h>.
* src/stat.c: Change #include "getopt.h" to #include <getopt.h>.
* src/system.h: Change #include "error.h" to #include <error.h>.

Copyright-paperwork-exempt: Yes
---

diff --git a/src/shuf.c b/src/shuf.c
index b7d6bbf31b..5b17ccf564 100644
--- a/src/shuf.c
+++ b/src/shuf.c
@@ -20,10 +20,10 @@
 #include <config.h>
 
 #include <sys/types.h>
+#include <getopt.h>
 #include "system.h"
 
 #include "fadvise.h"
-#include "getopt.h"
 #include "linebuffer.h"
 #include "quote.h"
 #include "randint.h"
diff --git a/src/stat.c b/src/stat.c
index 9aee46dd53..cb618b49fb 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -53,6 +53,7 @@
 # include <fs_info.h>
 #endif
 #include <selinux/selinux.h>
+#include <getopt.h>
 
 #include "system.h"
 
@@ -62,7 +63,6 @@
 #include "file-type.h"
 #include "filemode.h"
 #include "fs.h"
-#include "getopt.h"
 #include "mountlist.h"
 #include "quote.h"
 #include "stat-size.h"
diff --git a/src/system.h b/src/system.h
index 8b3c40d8d7..43c78de3fe 100644
--- a/src/system.h
+++ b/src/system.h
@@ -717,7 +717,7 @@ usable_st_size (struct stat const *sb)
 
 _Noreturn void usage (int status);
 
-#include "error.h"
+#include <error.h>
 
 /* Like error(0, 0, ...), but without an implicit newline.
    Also a noop unless the global DEV_DEBUG is set.  */