Merge fixes

This commit is contained in:
Hisham Muhammad
2015-02-23 03:53:36 -03:00
parent 8b5b73825e
commit 0a184b769f
7 changed files with 11 additions and 15 deletions

View File

@ -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;