Merge branch 'noheadergen' of https://github.com/zevweiss/htop into zevweiss-noheadergen

solaris/Battery.h

@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_Battery
 #define HEADER_Battery
 

solaris/Platform.c

@@ -33,28 +33,6 @@ in the source distribution for its full text.
 #include <math.h>
 #include <sys/var.h>
 
-/*{
-#include "Action.h"
-#include "BatteryMeter.h"
-#include "SignalsPanel.h"
-#include <signal.h>
-#include <sys/mkdev.h>
-#include <sys/proc.h>
-#include <libproc.h>
-
-#define  kill(pid, signal) kill(pid / 1024, signal)
-
-extern ProcessFieldData Process_fields[];
-typedef struct var kvar_t;
-
-typedef struct envAccum_ {
-   size_t capacity;
-   size_t size;
-   size_t bytes;
-   char *env;
-} envAccum;
-
-}*/
 
 double plat_loadavg[3] = {0};
 

solaris/Platform.h

@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_Platform
 #define HEADER_Platform
 /*

solaris/SolarisCRT.h

@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_SolarisCRT
 #define HEADER_SolarisCRT
 /*

solaris/SolarisProcess.c

@@ -17,50 +17,6 @@ in the source distribution for its full text.
 #include <unistd.h>
 #include <sys/syscall.h>
 
-/*{
-#include "Settings.h"
-#include <zone.h>
-#include <sys/proc.h>
-#include <libproc.h>
-
-typedef enum SolarisProcessFields {
-   // Add platform-specific fields here, with ids >= 100
-   ZONEID   = 100,
-   ZONE  = 101,
-   PROJID = 102,
-   TASKID = 103,
-   POOLID = 104,
-   CONTID = 105,
-   LWPID = 106,
-   LAST_PROCESSFIELD = 107,
-} SolarisProcessField;
-
-
-typedef struct SolarisProcess_ {
-   Process    super;
-   int        kernel;
-   zoneid_t   zoneid;
-   char*      zname;
-   taskid_t   taskid;
-   projid_t   projid;
-   poolid_t   poolid;
-   ctid_t     contid;
-   bool       is_lwp;
-   pid_t      realpid;
-   pid_t      realppid;
-   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
-
-}*/
 
 ProcessClass SolarisProcess_class = {
    .super = {

solaris/SolarisProcess.h

@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_SolarisProcess
 #define HEADER_SolarisProcess
 /*

solaris/SolarisProcessList.c

@@ -25,45 +25,6 @@ in the source distribution for its full text.
 
 #define MAXCMDLINE 255
 
-#define GZONE	"global    "
-#define UZONE	"unknown   "
-/*{
-
-#include "zfs/ZfsArcStats.h"
-
-#include <kstat.h>
-#include <sys/param.h>
-#include <sys/uio.h>
-#include <sys/resource.h>
-#include <sys/sysconf.h>
-#include <sys/sysinfo.h>
-#include <sys/swap.h>
-
-#define ZONE_ERRMSGLEN 1024
-char zone_errmsg[ZONE_ERRMSGLEN];
-
-typedef struct CPUData_ {
-   double userPercent;
-   double nicePercent;
-   double systemPercent;
-   double irqPercent;
-   double idlePercent;
-   double systemAllPercent;
-   uint64_t luser;
-   uint64_t lkrnl;
-   uint64_t lintr;
-   uint64_t lidle;
-} CPUData;
-
-typedef struct SolarisProcessList_ {
-   ProcessList super;
-   kstat_ctl_t* kd;
-   CPUData* cpus;
-   ZfsArcStats zfs;
-} SolarisProcessList;
-
-}*/
-
 char* SolarisProcessList_readZoneName(kstat_ctl_t* kd, SolarisProcess* sproc) {
   char* zname;
   if ( sproc->zoneid == 0 ) {

solaris/SolarisProcessList.h

@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_SolarisProcessList
 #define HEADER_SolarisProcessList
 /*