Further, minor cleanups to headers post-MakeHeaders

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

4 files changed, 1 insertions, 19 deletions

diff --git a/dragonflybsd/DragonFlyBSDCRT.h b/dragonflybsd/DragonFlyBSDCRT.h
index 2b98effb..2bf85f71 100644
--- a/dragonflybsd/DragonFlyBSDCRT.h
+++ b/dragonflybsd/DragonFlyBSDCRT.h
@@ -8,10 +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/dragonflybsd/DragonFlyBSDProcess.h b/dragonflybsd/DragonFlyBSDProcess.h
index a0381c67..d5e5a6ee 100644
--- a/dragonflybsd/DragonFlyBSDProcess.h
+++ b/dragonflybsd/DragonFlyBSDProcess.h
@@ -8,7 +8,6 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-
 typedef enum DragonFlyBSDProcessFields {
    // Add platform-specific fields here, with ids >= 100
    JID   = 100,
@@ -16,7 +15,6 @@ typedef enum DragonFlyBSDProcessFields {
    LAST_PROCESSFIELD = 102,
 } DragonFlyBSDProcessField;
 
-
 typedef struct DragonFlyBSDProcess_ {
    Process super;
    int   kernel;
@@ -24,16 +22,10 @@ typedef struct DragonFlyBSDProcess_ {
    char* jname;
 } DragonFlyBSDProcess;
 
-
-#ifndef Process_isKernelThread
 #define Process_isKernelThread(_process) (_process->kernel == 1)
-#endif
 
-#ifndef Process_isUserlandThread
 //#define Process_isUserlandThread(_process) (_process->pid != _process->tgid)
 #define Process_isUserlandThread(_process) (_process->nlwp > 1)
-#endif
-
 
 extern ProcessClass DragonFlyBSDProcess_class;
 
diff --git a/dragonflybsd/DragonFlyBSDProcessList.h b/dragonflybsd/DragonFlyBSDProcessList.h
index f677c3e4..403aa096 100644
--- a/dragonflybsd/DragonFlyBSDProcessList.h
+++ b/dragonflybsd/DragonFlyBSDProcessList.h
@@ -8,7 +8,6 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-
 #include <kvm.h>
 #include <sys/param.h>
 #include <osreldate.h>
@@ -21,17 +20,15 @@ in the source distribution for its full text.
 #include "DragonFlyBSDProcess.h"
 
 #define JAIL_ERRMSGLEN	1024
-char jail_errmsg[JAIL_ERRMSGLEN];
+extern char jail_errmsg[JAIL_ERRMSGLEN];
 
 typedef struct CPUData_ {
-
    double userPercent;
    double nicePercent;
    double systemPercent;
    double irqPercent;
    double idlePercent;
    double systemAllPercent;
-
 } CPUData;
 
 typedef struct DragonFlyBSDProcessList_ {
@@ -54,10 +51,8 @@ typedef struct DragonFlyBSDProcessList_ {
    Hashtable *jails;
 } DragonFlyBSDProcessList;
 
-
 #define _UNUSED_ __attribute__((unused))
 
-
 ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
 
 void ProcessList_delete(ProcessList* this);
diff --git a/dragonflybsd/Platform.h b/dragonflybsd/Platform.h
index aa00d656..c6792a28 100644
--- a/dragonflybsd/Platform.h
+++ b/dragonflybsd/Platform.h
@@ -14,7 +14,6 @@ in the source distribution for its full text.
 
 extern ProcessFieldData Process_fields[];
 
-
 #ifndef CLAMP
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif