mirror of
https://github.com/xzeldon/htop.git
synced 2025-07-12 12:14:36 +03:00
Merge fixes
This commit is contained in:
@ -45,8 +45,6 @@ in the source distribution for its full text.
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
typedef struct Settings_ Settings;
|
||||
|
||||
#define PROCESS_FLAG_IO 1
|
||||
#define PROCESS_FLAG_IOPRIO 2
|
||||
#define PROCESS_FLAG_OPENVZ 4
|
||||
@ -660,7 +658,7 @@ ObjectClass Process_class = {
|
||||
.compare = Process_compare
|
||||
};
|
||||
|
||||
void Process_init(Process* this, struct Settings_* settings, struct ProcessList_* pl) {
|
||||
void Process_init(Process* this, struct ProcessList_* pl) {
|
||||
this->pid = 0;
|
||||
this->pl = pl;
|
||||
this->tag = false;
|
||||
|
Reference in New Issue
Block a user