diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
| commit | 36318d1929e9437df0402a78ff63a70f78d6a89e (patch) | |
| tree | 38588eaa8b400d7abf384a17e21dea75b104b177 /libmachdev/ds_routines.c | |
| parent | eaa21da4ea94937a1bc2157c042a233d524d17ce (diff) | |
| parent | d261675a592f6109826ccbdb07c7f485c4c88683 (diff) | |
Merge branch 'dde-upstream' into dde
Conflicts:
dde_e100/Makefile
dde_e1000/Makefile
dde_ne2k_pci/Makefile
dde_pcnet32/Makefile
dde_rtl8139/Makefile
Diffstat (limited to 'libmachdev/ds_routines.c')
| -rw-r--r-- | libmachdev/ds_routines.c | 5 |
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; } |