diff options
| author | christos <christos@NetBSD.org> | 2005-09-13 02:45:38 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2005-09-13 02:45:38 +0000 |
| commit | f1cc481dfe340f3705f088ab7beacf3171439c87 (patch) | |
| tree | 42f811293829a93c519683f2aaab49dfa65a9229 /lib/libpthread | |
| parent | 478e2d98de875764acc305789c843fe8e9db93b6 (diff) | |
XXX: Work around libpthread's "intimate" connection with libc.
Diffstat (limited to 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpthread/pthread_cancelstub.c | 6 | ||||
| -rw-r--r-- | lib/libpthread/pthread_sig.c | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index ced7c181e11..49509f99ff0 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/06/17 18:37:24 peter Exp $ +# $NetBSD: Makefile,v 1.34 2005/09/13 02:45:38 christos Exp $ # WARNS= 2 @@ -17,6 +17,8 @@ ARCHSUBDIR= ${MACHINE_CPU} @echo "WARNING: no ARCHSUBDIR for ${MACHINE_ARCH}/${MACHINE_CPU}; skipping..." .endif +# XXX: This crappy poke at libc's internals needs to be fixed. +CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${.CURDIR}/../libc INCS= pthread.h pthread_types.h pthread_queue.h INCSDIR=/usr/include diff --git a/lib/libpthread/pthread_cancelstub.c b/lib/libpthread/pthread_cancelstub.c index b4e7fbc81f4..efcd9c40058 100644 --- a/lib/libpthread/pthread_cancelstub.c +++ b/lib/libpthread/pthread_cancelstub.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_cancelstub.c,v 1.12 2005/03/21 09:00:49 kleink Exp $ */ +/* $NetBSD: pthread_cancelstub.c,v 1.13 2005/09/13 02:45:38 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pthread_cancelstub.c,v 1.12 2005/03/21 09:00:49 kleink Exp $"); +__RCSID("$NetBSD: pthread_cancelstub.c,v 1.13 2005/09/13 02:45:38 christos Exp $"); /* * This is necessary because the names are always weak (they are not @@ -68,6 +68,8 @@ __RCSID("$NetBSD: pthread_cancelstub.c,v 1.12 2005/03/21 09:00:49 kleink Exp $") #include <sys/select.h> #include <sys/socket.h> +#include <compat/sys/mman.h> + #include "pthread.h" #include "pthread_int.h" diff --git a/lib/libpthread/pthread_sig.c b/lib/libpthread/pthread_sig.c index 09add4fc756..07382811d27 100644 --- a/lib/libpthread/pthread_sig.c +++ b/lib/libpthread/pthread_sig.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_sig.c,v 1.41 2005/07/26 20:16:07 christos Exp $ */ +/* $NetBSD: pthread_sig.c,v 1.42 2005/09/13 02:45:38 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pthread_sig.c,v 1.41 2005/07/26 20:16:07 christos Exp $"); +__RCSID("$NetBSD: pthread_sig.c,v 1.42 2005/09/13 02:45:38 christos Exp $"); /* We're interposing a specific version of the signal interface. */ #define __LIBC12_SOURCE__ @@ -54,6 +54,7 @@ __RCSID("$NetBSD: pthread_sig.c,v 1.41 2005/07/26 20:16:07 christos Exp $"); #include <string.h> /* for memcpy() */ #include <ucontext.h> #include <unistd.h> +#include <compat/include/signal.h> #include <sys/syscall.h> #include <sched.h> |
