From 68107ec092e7cc3fcd1f56edf9da8085cffed00d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 12 Apr 2003 08:38:14 +0000 Subject: Update. * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise. --- nptl/descr.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'nptl/descr.h') diff --git a/nptl/descr.h b/nptl/descr.h index 28b7afa1a1..efb25c7479 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -63,18 +63,19 @@ information. */ struct pthread_unwind_buf { + struct + { + __jmp_buf jmp_buf; + int mask_was_saved; + } cancel_jmp_buf[1]; + union { /* This is the placeholder of the public version. */ - void *pad[16]; + void *pad[4]; struct { -#ifdef HAVE_FORCED_UNWIND - /* First the machine-specific unwind info. */ - struct _Unwind_Exception exc; -#endif - /* Pointer to the previous cleanup buffer. */ __pthread_unwind_buf_t *prev; @@ -87,12 +88,6 @@ struct pthread_unwind_buf int canceltype; } data; } priv; - - struct - { - __jmp_buf jmp_buf; - int mask_was_saved; - } cancel_jmp_buf[1]; }; @@ -226,6 +221,11 @@ struct pthread /* Next descriptor with a pending event. */ struct pthread *nextevent; +#ifdef HAVE_FORCED_UNWIND + /* Machine-specific unwind info. */ + struct _Unwind_Exception exc; +#endif + /* If nonzero pointer to area allocated for the stack and its size. */ void *stackblock; -- cgit v1.2.3