about summary refs log tree commit diff
path: root/nptl/pthreadP.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-16 20:52:36 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-16 20:52:36 +0000
commit9634cf9d4f30861dbf3ee057a1219227d8c8f19d (patch)
treef00a24f7e4d536c1bf4771e98150503222dc765b /nptl/pthreadP.h
parente150fddc7c1024447a9489635f6f2071a6bfdfcc (diff)
downloadglibc-9634cf9d4f30861dbf3ee057a1219227d8c8f19d.tar.gz
glibc-9634cf9d4f30861dbf3ee057a1219227d8c8f19d.tar.xz
glibc-9634cf9d4f30861dbf3ee057a1219227d8c8f19d.zip
Update.
2002-12-16  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/i386/socket.S: Use CENABLE and CDISABLE
	macros instead of doing the calls directly.
	* sysdeps/unix/make-syscalls.sh: Add ptw-*.$o target name to rules.
	* Makerules ($(+sysdir_pfx)sysd-rules): Emit rules for ptw-%
	targets.

2002-12-16  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/i386/fpu/bits/mathinline.h: Backout last change.
	* sysdeps/ieee754/bits/nan.h: Likewise.

	* sysdeps/unix/sysv/linux/ia64/syscalls.list (__syscall_open,
	__syscall_wait4, __syscall_ioctl, __syscall_write): Add.
Diffstat (limited to 'nptl/pthreadP.h')
-rw-r--r--nptl/pthreadP.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index e759e83062..c666387008 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -129,12 +129,20 @@ extern struct pthread_functions __libc_pthread_functions attribute_hidden;
 #define CANCEL_RESET(oldtype) \
   __pthread_disable_asynccancel (oldtype)
 
+#if !defined NOT_IN_libc
 /* Same as CANCEL_ASYNC, but for use in libc.so.  */
-#define LIBC_CANCEL_ASYNC() \
+# define LIBC_CANCEL_ASYNC() \
   __libc_enable_asynccancel ()
 /* Same as CANCEL_RESET, but for use in libc.so.  */
-#define LIBC_CANCEL_RESET(oldtype) \
+# define LIBC_CANCEL_RESET(oldtype) \
   __libc_disable_asynccancel (oldtype)
+#elif defined NOT_IN_libc && defined IS_IN_libpthread
+# define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
+# define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
+#else
+# define LIBC_CANCEL_ASYNC()	0 /* Just a dummy value.  */
+# define LIBC_CANCEL_RESET(val)	((void)(val)) /* Nothing, but evaluate it.  */
+#endif
 
 
 /* This function is responsible for calling all registered cleanup