Merge branch 'dde-clean' into upstream-merged

1 files changed, 3 insertions, 2 deletions

diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c
index 6b8d1d4d..63457553 100644
--- a/libmachdev/ds_routines.c
+++ b/libmachdev/ds_routines.c
@@ -59,7 +59,6 @@
 
 #include <hurd.h>
 #include <mach.h>
-#include <cthreads.h>
 
 #include <ddekit/thread.h>
 
@@ -467,7 +466,7 @@ void reg_dev_emul (struct device_emulation_ops *ops)
   emulation_list[num_emul++] = ops;
 }
 
-void ds_server()
+void * ds_server(void *arg)
 {
   /* This thread calls Linux functions,
    * so I need to make it known to the Linux environment. */
@@ -478,4 +477,6 @@ void ds_server()
     {
       ports_manage_port_operations_one_thread (port_bucket, demuxer, 0);
     } while (1);
+
+  return NULL;
 }