From c4329fb9531d75f627a02636d1347726f911ab01 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Mon, 3 Apr 2023 07:48:51 -0400
Subject: Move local headers after system headers

Avoid compiler warnings on Windows by moving local headers after
system headers.

* src/job.c: Move all headers other than makeint.h.
* src/main.c: Ditto.
* src/read.c: Ditto.
---
 src/job.c  | 20 ++++++++++----------
 src/main.c | 23 ++++++++++++-----------
 src/read.c | 18 +++++++++---------
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/job.c b/src/job.c
index 4df75132..34ef9b80 100644
--- a/src/job.c
+++ b/src/job.c
@@ -19,16 +19,6 @@ this program.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <assert.h>
 #include <string.h>
 
-#include "job.h"
-#include "debug.h"
-#include "filedef.h"
-#include "commands.h"
-#include "variable.h"
-#include "os.h"
-#include "dep.h"
-#include "shuffle.h"
-#include "warning.h"
-
 /* Default shell to use.  */
 #if MK_OS_W32
 # include <windows.h>
@@ -196,6 +186,16 @@ int getgid ();
 int getloadavg (double loadavg[], int nelem);
 #endif
 
+#include "job.h"
+#include "debug.h"
+#include "filedef.h"
+#include "commands.h"
+#include "variable.h"
+#include "os.h"
+#include "dep.h"
+#include "shuffle.h"
+#include "warning.h"
+
 /* Different systems have different requirements for pid_t.
    Plus we have to support gettext string translation... Argh.  */
 static const char *
diff --git a/src/main.c b/src/main.c
index 7b8e91cf..6a94cfdb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,17 +15,6 @@ You should have received a copy of the GNU General Public License along with
 this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "makeint.h"
-#include "os.h"
-#include "filedef.h"
-#include "dep.h"
-#include "variable.h"
-#include "job.h"
-#include "commands.h"
-#include "rule.h"
-#include "debug.h"
-#include "getopt.h"
-#include "shuffle.h"
-#include "warning.h"
 
 #include <assert.h>
 #if MK_OS_W32
@@ -93,6 +82,18 @@ void exit (int) NORETURN;
 double atof ();
 #endif
 
+#include "os.h"
+#include "filedef.h"
+#include "dep.h"
+#include "variable.h"
+#include "job.h"
+#include "commands.h"
+#include "rule.h"
+#include "debug.h"
+#include "getopt.h"
+#include "shuffle.h"
+#include "warning.h"
+
 static void clean_jobserver (int status);
 static void print_data_base (void);
 static void print_version (void);
diff --git a/src/read.c b/src/read.c
index 91171081..3909fc64 100644
--- a/src/read.c
+++ b/src/read.c
@@ -18,6 +18,15 @@ this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
 
+#if MK_OS_W32
+# include <windows.h>
+# include "sub_proc.h"
+#elif MK_OS_VMS
+struct passwd *getpwnam (char *name);
+#else
+# include <pwd.h>
+#endif
+
 #include "filedef.h"
 #include "dep.h"
 #include "job.h"
@@ -29,15 +38,6 @@ this program.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "hash.h"
 #include "warning.h"
 
-#if MK_OS_W32
-# include <windows.h>
-# include "sub_proc.h"
-#elif MK_OS_VMS
-struct passwd *getpwnam (char *name);
-#else
-# include <pwd.h>
-#endif
-
 /* A 'struct ebuffer' controls the origin of the makefile we are currently
    eval'ing.
 */
-- 
cgit v1.2.1