Skip to content

Commit

Permalink
Make header sort order consistent again
Browse files Browse the repository at this point in the history
  • Loading branch information
BenBE committed May 24, 2023
1 parent b3cf54e commit 32f8d4c
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions SignalsPanel.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ in the source distribution for its full text.

#include "config.h" // IWYU pragma: keep

#include "Panel.h"

#ifndef HTOP_SOLARIS
#include <signal.h>
#endif

#include "Panel.h"


typedef struct SignalItem_ {
const char* name;
Expand Down
1 change: 1 addition & 0 deletions generic/gettime.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ htop - generic/gettime.c
Released under the GNU GPLv2+, see the COPYING file
in the source distribution for its full text.
*/

#include "config.h" // IWYU pragma: keep

#include "generic/gettime.h"
Expand Down
1 change: 1 addition & 0 deletions generic/hostname.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ htop - generic/hostname.c
Released under the GNU GPLv2+, see the COPYING file
in the source distribution for its full text.
*/

#include "config.h" // IWYU pragma: keep

#include "generic/hostname.h"
Expand Down
1 change: 1 addition & 0 deletions generic/uname.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ htop - generic/uname.c
Released under the GNU GPLv2+, see the COPYING file
in the source distribution for its full text.
*/

#include "config.h" // IWYU pragma: keep

#include "generic/uname.h"
Expand Down
4 changes: 2 additions & 2 deletions linux/LibSensors.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "linux/LibSensors.h"

#include "config.h" // IWYU pragma: keep

#include "linux/LibSensors.h"

#ifdef HAVE_SENSORS_SENSORS_H

#include <assert.h>
Expand Down
2 changes: 1 addition & 1 deletion linux/LinuxProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ in the source distribution for its full text.
#include <stdbool.h>
#include <sys/types.h>

#include "linux/IOPriority.h"
#include "Machine.h"
#include "Object.h"
#include "Process.h"
#include "linux/IOPriority.h"


#define PROCESS_FLAG_LINUX_IOPRIO 0x00000100
Expand Down
3 changes: 1 addition & 2 deletions linux/Platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Released under the GNU GPLv2+, see the COPYING file
in the source distribution for its full text.
*/

#include "ZramMeter.h"
#include "config.h" // IWYU pragma: keep

#include "linux/Platform.h"
Expand Down Expand Up @@ -47,7 +46,6 @@ in the source distribution for its full text.
#include "Panel.h"
#include "PressureStallMeter.h"
#include "ProvideCurses.h"
#include "linux/SELinuxMeter.h"
#include "Settings.h"
#include "SwapMeter.h"
#include "SysArchMeter.h"
Expand All @@ -58,6 +56,7 @@ in the source distribution for its full text.
#include "linux/IOPriorityPanel.h"
#include "linux/LinuxMachine.h"
#include "linux/LinuxProcess.h"
#include "linux/SELinuxMeter.h"
#include "linux/SystemdMeter.h"
#include "linux/ZramMeter.h"
#include "linux/ZramStats.h"
Expand Down
1 change: 1 addition & 0 deletions linux/Platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ in the source distribution for its full text.
#include "generic/hostname.h"
#include "generic/uname.h"


/* GNU/Hurd does not have PATH_MAX in limits.h */
#ifndef PATH_MAX
#define PATH_MAX 4096
Expand Down
1 change: 1 addition & 0 deletions pcp/PCPDynamicMeter.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ htop - PCPDynamicMeter.c
Released under the GNU GPLv2+, see the COPYING file
in the source distribution for its full text.
*/

#include "config.h" // IWYU pragma: keep

#include "pcp/PCPDynamicMeter.h"
Expand Down
2 changes: 1 addition & 1 deletion pcp/PCPMachine.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ in the source distribution for its full text.
#include <string.h>
#include <sys/time.h>

#include "Macros.h"
#include "Machine.h"
#include "Macros.h"
#include "Object.h"
#include "Platform.h"
#include "Settings.h"
Expand Down
2 changes: 1 addition & 1 deletion pcp/PCPProcessList.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ in the source distribution for its full text.
#include <string.h>
#include <sys/time.h>

#include "Macros.h"
#include "Machine.h"
#include "Macros.h"
#include "Object.h"
#include "Platform.h"
#include "Process.h"
Expand Down
2 changes: 1 addition & 1 deletion solaris/Platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ in the source distribution for its full text.

#include "Action.h"
#include "BatteryMeter.h"
#include "CommandLine.h"
#include "DiskIOMeter.h"
#include "Hashtable.h"
#include "NetworkIOMeter.h"
#include "ProcessLocksScreen.h"
#include "SignalsPanel.h"
#include "CommandLine.h"
#include "generic/gettime.h"
#include "generic/hostname.h"
#include "generic/uname.h"
Expand Down
4 changes: 2 additions & 2 deletions solaris/SolarisMachine.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ in the source distribution for its full text.
#include <stdbool.h>
#include <stdint.h>
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/resource.h>
#include <sys/swap.h>
#include <sys/sysconf.h>
#include <sys/sysinfo.h>
#include <sys/swap.h>
#include <sys/uio.h>

#include "Hashtable.h"
#include "UsersTable.h"
Expand Down

0 comments on commit 32f8d4c

Please sign in to comment.