Merge fixes

1 files changed, 1 insertions, 3 deletions

diff --git a/Process.c b/Process.c
index dbdb4810..16ac7001 100644
--- a/Process.c
+++ b/Process.c
@@ -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;