summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2020-09-18 19:23:04 +0200
committerBenny Baumann <BenBE@geshi.org>2020-09-29 17:41:49 +0200
commite1c96879f444150b01c7f556cacdca82c811efb1 (patch)
treeefea9fc598cae3758687414e4e062eb5637aeb8a
parentdac1e05a2c7ac68993f6d046c43fbef209458206 (diff)
Sort headers/includes
-rw-r--r--Affinity.c2
-rw-r--r--AvailableMetersPanel.h4
-rw-r--r--CategoriesPanel.h4
-rw-r--r--ColorsPanel.h2
-rw-r--r--DisplayOptionsPanel.h2
-rw-r--r--IncSet.h3
-rw-r--r--InfoScreen.h4
-rw-r--r--Meter.h3
-rw-r--r--MetersPanel.h2
-rw-r--r--Panel.h2
-rw-r--r--Process.h4
-rw-r--r--ProcessList.h4
-rw-r--r--ScreenManager.h2
-rw-r--r--Settings.h3
-rw-r--r--XAlloc.h2
15 files changed, 24 insertions, 19 deletions
diff --git a/Affinity.c b/Affinity.c
index 098e5c16..d207e5a3 100644
--- a/Affinity.c
+++ b/Affinity.c
@@ -6,6 +6,8 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text.
*/
+#include "config.h"
+
#include "Affinity.h"
#include <stdlib.h>
diff --git a/AvailableMetersPanel.h b/AvailableMetersPanel.h
index ecebb28d..92d7c941 100644
--- a/AvailableMetersPanel.h
+++ b/AvailableMetersPanel.h
@@ -7,10 +7,10 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text.
*/
-#include "Settings.h"
#include "Panel.h"
-#include "ScreenManager.h"
#include "ProcessList.h"
+#include "ScreenManager.h"
+#include "Settings.h"
typedef struct AvailableMetersPanel_ {
Panel super;
diff --git a/CategoriesPanel.h b/CategoriesPanel.h
index fefc3e93..5f8cb0f5 100644
--- a/CategoriesPanel.h
+++ b/CategoriesPanel.h
@@ -8,9 +8,9 @@ in the source distribution for its full text.
*/
#include "Panel.h"
-#include "Settings.h"
-#include "ScreenManager.h"
#include "ProcessList.h"
+#include "ScreenManager.h"
+#include "Settings.h"
typedef struct CategoriesPanel_ {
Panel super;
diff --git a/ColorsPanel.h b/ColorsPanel.h
index 479fad08..8dd61711 100644
--- a/ColorsPanel.h
+++ b/ColorsPanel.h
@@ -8,8 +8,8 @@ in the source distribution for its full text.
*/
#include "Panel.h"
-#include "Settings.h"
#include "ScreenManager.h"
+#include "Settings.h"
typedef struct ColorsPanel_ {
Panel super;
diff --git a/DisplayOptionsPanel.h b/DisplayOptionsPanel.h
index 499b2fc1..b103503b 100644
--- a/DisplayOptionsPanel.h
+++ b/DisplayOptionsPanel.h
@@ -8,8 +8,8 @@ in the source distribution for its full text.
*/
#include "Panel.h"
-#include "Settings.h"
#include "ScreenManager.h"
+#include "Settings.h"
typedef struct DisplayOptionsPanel_ {
Panel super;
diff --git a/IncSet.h b/IncSet.h
index 2fb22c49..81f0f54c 100644
--- a/IncSet.h
+++ b/IncSet.h
@@ -7,9 +7,10 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text.
*/
+#include <stdbool.h>
+
#include "FunctionBar.h"
#include "Panel.h"
-#include <stdbool.h>
#define INCMODE_MAX 40
diff --git a/InfoScreen.h b/InfoScreen.h
index a5a5abf6..196c56e1 100644
--- a/InfoScreen.h
+++ b/InfoScreen.h
@@ -1,10 +1,10 @@
#ifndef HEADER_InfoScreen
#define HEADER_InfoScreen
-#include "Process.h"
-#include "Panel.h"
#include "FunctionBar.h"
#include "IncSet.h"
+#include "Panel.h"
+#include "Process.h"
typedef struct InfoScreen_ InfoScreen;
diff --git a/Meter.h b/Meter.h
index 03b49608..da1dc5df 100644
--- a/Meter.h
+++ b/Meter.h
@@ -7,9 +7,10 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text.
*/
-#include "ListItem.h"
#include <sys/time.h>
+#include "ListItem.h"
+
#define METER_BUFFER_LEN 256
typedef struct Meter_ Meter;
diff --git a/MetersPanel.h b/MetersPanel.h
index dbc31ee4..919b117d 100644
--- a/MetersPanel.h
+++ b/MetersPanel.h
@@ -8,8 +8,8 @@ in the source distribution for its full text.
*/
#include "Panel.h"
-#include "Settings.h"
#include "ScreenManager.h"
+#include "Settings.h"
typedef struct MetersPanel_ MetersPanel;
diff --git a/Panel.h b/Panel.h
index 1c7c171d..e5b28a41 100644
--- a/Panel.h
+++ b/Panel.h
@@ -7,9 +7,9 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text.
*/
+#include "FunctionBar.h"
#include "Object.h"
#include "Vector.h"
-#include "FunctionBar.h"
typedef struct Panel_ Panel;
diff --git a/Process.h b/Process.h
index 404f73e6..a2f266f7 100644
--- a/Process.h
+++ b/Process.h
@@ -20,10 +20,10 @@ in the source distribution for its full text.
#endif
#define PAGE_SIZE_KB ( PAGE_SIZE / ONE_K )
-#include "Object.h"
-
#include <sys/types.h>
+#include "Object.h"
+
#define PROCESS_FLAG_IO 0x0001
typedef enum ProcessFields {
diff --git a/ProcessList.h b/ProcessList.h
index 7b572d8f..34f92b1b 100644
--- a/ProcessList.h
+++ b/ProcessList.h
@@ -7,12 +7,12 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text.
*/
-#include "Vector.h"
#include "Hashtable.h"
-#include "UsersTable.h"
#include "Panel.h"
#include "Process.h"
#include "Settings.h"
+#include "UsersTable.h"
+#include "Vector.h"
#ifdef HAVE_LIBHWLOC
#include <hwloc.h>
diff --git a/ScreenManager.h b/ScreenManager.h
index 6f19ab8f..4c78efd3 100644
--- a/ScreenManager.h
+++ b/ScreenManager.h
@@ -7,10 +7,10 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text.
*/
-#include "Vector.h"
#include "Header.h"
#include "Settings.h"
#include "Panel.h"
+#include "Vector.h"
typedef enum Orientation_ {
VERTICAL,
diff --git a/Settings.h b/Settings.h
index e1518eca..2f52681c 100644
--- a/Settings.h
+++ b/Settings.h
@@ -9,9 +9,10 @@ in the source distribution for its full text.
#define DEFAULT_DELAY 15
-#include "Process.h"
#include <stdbool.h>
+#include "Process.h"
+
typedef struct {
int len;
char** names;
diff --git a/XAlloc.h b/XAlloc.h
index 32389e57..97c15519 100644
--- a/XAlloc.h
+++ b/XAlloc.h
@@ -7,8 +7,8 @@
#include "Macros.h"
-#include <err.h>
#include <assert.h>
+#include <err.h>
#include <stdlib.h>
void fail(void) ATTR_NORETURN;

© 2014-2024 Faster IT GmbH | imprint | privacy policy