From 6c66f32fa75134c01d321c54b891321e48520b1b Mon Sep 17 00:00:00 2001
From: Benny Baumann <BenBE@geshi.org>
Date: Sat, 3 Apr 2021 20:49:45 +0200
Subject: [PATCH] Include signal.h, reorder headers

---
 solaris/Platform.c       | 25 +++++++++++++------------
 solaris/Platform.h       |  4 ++++
 solaris/SolarisProcess.c | 12 +++++++-----
 solaris/SolarisProcess.h |  6 +++++-
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/solaris/Platform.c b/solaris/Platform.c
index cadf092c..81e8d28d 100644
--- a/solaris/Platform.c
+++ b/solaris/Platform.c
@@ -7,7 +7,19 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Platform.h"
+#include "solaris/Platform.h"
+
+#include <kstat.h>
+#include <math.h>
+#include <string.h>
+#include <time.h>
+#include <utmpx.h>
+#include <sys/loadavg.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/var.h>
+
 #include "Macros.h"
 #include "Meter.h"
 #include "CPUMeter.h"
@@ -26,17 +38,6 @@ in the source distribution for its full text.
 #include "SolarisProcess.h"
 #include "SolarisProcessList.h"
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <utmpx.h>
-#include <sys/loadavg.h>
-#include <string.h>
-#include <kstat.h>
-#include <time.h>
-#include <math.h>
-#include <sys/var.h>
-
 
 double plat_loadavg[3] = {0};
 
diff --git a/solaris/Platform.h b/solaris/Platform.h
index 9f479d1b..cca857bc 100644
--- a/solaris/Platform.h
+++ b/solaris/Platform.h
@@ -9,9 +9,12 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include <libproc.h>
 #include <signal.h>
 #include <stdbool.h>
+
 #include <sys/mkdev.h>
 #include <sys/proc.h>
 #include <sys/types.h>
@@ -22,6 +25,7 @@ in the source distribution for its full text.
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
+
 #include "generic/hostname.h"
 #include "generic/uname.h"
 
diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c
index 313fd96d..c0bc295a 100644
--- a/solaris/SolarisProcess.c
+++ b/solaris/SolarisProcess.c
@@ -6,17 +6,19 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Process.h"
-#include "ProcessList.h"
-#include "SolarisProcess.h"
-#include "Platform.h"
-#include "CRT.h"
+#include "solaris/SolarisProcess.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/syscall.h>
 
+#include "Process.h"
+#include "ProcessList.h"
+#include "CRT.h"
+
+#include "solaris/Platform.h"
+
 
 const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
    [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
diff --git a/solaris/SolarisProcess.h b/solaris/SolarisProcess.h
index 74cbb861..d8cef803 100644
--- a/solaris/SolarisProcess.h
+++ b/solaris/SolarisProcess.h
@@ -8,11 +8,15 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Settings.h"
+#include "config.h" // IWYU pragma: keep
+
 #include <zone.h>
 #include <sys/proc.h>
 #include <libproc.h>
 
+#include "Settings.h"
+
+
 typedef struct SolarisProcess_ {
    Process    super;
    int        kernel;