diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-12 01:25:53 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-12 01:25:53 +0000 |
| commit | 5a8f3cd8adaabc814a916e225ff4af9c0689ac92 (patch) | |
| tree | fd143874aff6f0291c08b1b2fd3dd87c49ec36c9 /channelio | |
| parent | becf233178d2cf402591e97d7a8499cafbbb7251 (diff) | |
Fix build against libpthreadlibchannel
* channelio/Makefile (HURDLIBS): Remove threads.
(OTHERLIBS): Add -lpthread.
* channelio/open.h: Use pthread functions instead of cthreads functions.
* libchannel/broadcast.c: Likewise.
* libchannel/channel.h: Likewise.
* libchannel/hub.c: Likewise.
Diffstat (limited to 'channelio')
| -rw-r--r-- | channelio/Makefile | 3 | ||||
| -rw-r--r-- | channelio/open.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/channelio/Makefile b/channelio/Makefile index 457d8d6a8..5c1130f7a 100644 --- a/channelio/Makefile +++ b/channelio/Makefile @@ -25,6 +25,7 @@ SRCS = channelio.c io.c node.c open.c LCLHDRS = node.h open.h OBJS = $(SRCS:.c=.o) -HURDLIBS = trivfs fshelp iohelp channel threads ports ihash shouldbeinlibc +HURDLIBS = trivfs fshelp iohelp channel ports ihash shouldbeinlibc +OTHERLIBS = -lpthread include ../Makeconf diff --git a/channelio/open.h b/channelio/open.h index 43dc85407..98f1d47c1 100644 --- a/channelio/open.h +++ b/channelio/open.h @@ -22,13 +22,13 @@ #ifndef __OPEN_H__ #define __OPEN_H__ -#include <cthreads.h> +#include <pthread.h> #include <hurd/channel.h> /* Information about an open session. */ struct open { - struct mutex lock; + pthread_mutex_t lock; struct channel *channel; /* The current owner of the session. For terminals, this affects |