Further, minor cleanups to headers post-MakeHeaders

Remove leftover empty ifdef/endif pairs, whitespace.
The generated htop.h file was also unused - removed.

5 files changed, 1 insertions, 15 deletions

diff --git a/solaris/Battery.h b/solaris/Battery.h
index 24d8f5c2..21a1579a 100644
--- a/solaris/Battery.h
+++ b/solaris/Battery.h
@@ -3,5 +3,4 @@
 
 void Battery_getData(double* level, ACPresence* isOnAC);
 
-
 #endif
diff --git a/solaris/Platform.h b/solaris/Platform.h
index 041bf3fb..dd8614dc 100644
--- a/solaris/Platform.h
+++ b/solaris/Platform.h
@@ -29,7 +29,6 @@ typedef struct envAccum_ {
    char *env;
 } envAccum;
 
-
 extern double plat_loadavg[3];
 
 extern const SignalItem Platform_signals[];
diff --git a/solaris/SolarisCRT.h b/solaris/SolarisCRT.h
index 01b75696..4e37b7f6 100644
--- a/solaris/SolarisCRT.h
+++ b/solaris/SolarisCRT.h
@@ -8,9 +8,6 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-#ifdef HAVE_EXECINFO_H
-#endif
-
 void CRT_handleSIGSEGV(int sgn);
 
 #endif
diff --git a/solaris/SolarisProcess.h b/solaris/SolarisProcess.h
index a1064a30..d36dea3e 100644
--- a/solaris/SolarisProcess.h
+++ b/solaris/SolarisProcess.h
@@ -13,7 +13,7 @@ in the source distribution for its full text.
 #include <sys/proc.h>
 #include <libproc.h>
 
-typedef enum SolarisProcessFields {
+typedef enum SolarisProcessField_ {
    // Add platform-specific fields here, with ids >= 100
    ZONEID   = 100,
    ZONE  = 101,
@@ -25,7 +25,6 @@ typedef enum SolarisProcessFields {
    LAST_PROCESSFIELD = 107,
 } SolarisProcessField;
 
-
 typedef struct SolarisProcess_ {
    Process    super;
    int        kernel;
@@ -41,15 +40,9 @@ typedef struct SolarisProcess_ {
    pid_t      lwpid;
 } SolarisProcess;
 
-
-#ifndef Process_isKernelThread
 #define Process_isKernelThread(_process) (_process->kernel == 1)
-#endif
 
-#ifndef Process_isUserlandThread
 #define Process_isUserlandThread(_process) (_process->pid != _process->tgid)
-#endif
-
 
 extern ProcessClass SolarisProcess_class;
 
diff --git a/solaris/SolarisProcessList.h b/solaris/SolarisProcessList.h
index 89ec46b2..25962685 100644
--- a/solaris/SolarisProcessList.h
+++ b/solaris/SolarisProcessList.h
@@ -46,7 +46,6 @@ typedef struct SolarisProcessList_ {
    ZfsArcStats zfs;
 } SolarisProcessList;
 
-
 char* SolarisProcessList_readZoneName(kstat_ctl_t* kd, SolarisProcess* sproc);
 
 ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
@@ -63,5 +62,4 @@ int SolarisProcessList_walkproc(psinfo_t *_psinfo, lwpsinfo_t *_lwpsinfo, void *
 
 void ProcessList_goThroughEntries(ProcessList* this);
 
-
 #endif