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/dev_hdr.h | |
| 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/dev_hdr.h')
| -rw-r--r-- | libmachdev/dev_hdr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmachdev/dev_hdr.h b/libmachdev/dev_hdr.h index f6394256..79edc43a 100644 --- a/libmachdev/dev_hdr.h +++ b/libmachdev/dev_hdr.h @@ -59,7 +59,7 @@ #include <mach.h> #include <hurd.h> #include <hurd/ports.h> -#include <cthreads.h> +#include <pthread.h> #include "device_emul.h" @@ -127,7 +127,7 @@ boolean_t dev_map(boolean_t (*)(), mach_port_t); /* * To lock and unlock state and open-count */ -#define device_lock(device) mutex_lock(&(device)->lock) -#define device_unlock(device) mutex_unlock(&(device)->lock) +#define device_lock(device) pthread_mutex_lock(&(device)->lock) +#define device_unlock(device) pthread_mutex_unlock(&(device)->lock) #endif /* _DEVICE_DEV_HDR_H_ */ |