diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-11-24 18:16:42 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-11-24 18:16:42 +0000 |
| commit | 16feadf264b6508bc5583a56a2c7a7aaafc1e383 (patch) | |
| tree | ec461d3780d78320b64f9e5772feda4f0a821525 /nptl | |
| parent | bd547139c77f2f3bb581d329e70c2c5cd246a3ab (diff) | |
| download | glibc-16feadf264b6508bc5583a56a2c7a7aaafc1e383.tar.gz glibc-16feadf264b6508bc5583a56a2c7a7aaafc1e383.tar.xz glibc-16feadf264b6508bc5583a56a2c7a7aaafc1e383.zip | |
[BZ #1920]
005-11-24 Jakub Jelinek <jakub@redhat.com> [BZ #1920] * sysdeps/pthread/pthread.h (__pthread_unwind_next): Use __attribute__ instead of __attribute. * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h (__cleanup_fct_attribute): Likewise.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 2b76775bcc..c61769a2d3 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,11 @@ +005-11-24 Jakub Jelinek <jakub@redhat.com> + + [BZ #1920] + * sysdeps/pthread/pthread.h (__pthread_unwind_next): Use + __attribute__ instead of __attribute. + * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h + (__cleanup_fct_attribute): Likewise. + 2005-11-17 Jakub Jelinek <jakub@redhat.com> * sysdeps/pthread/unwind-forcedunwind.c (pthread_cancel_init): Put diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 92e66f7c72..badadae169 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -657,9 +657,9 @@ extern void __pthread_unregister_cancel_restore (__pthread_unwind_buf_t *__buf) /* Internal interface to initiate cleanup. */ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf) - __cleanup_fct_attribute __attribute ((__noreturn__)) + __cleanup_fct_attribute __attribute__ ((__noreturn__)) # ifndef SHARED - __attribute ((__weak__)) + __attribute__ ((__weak__)) # endif ; #endif diff --git a/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h index 4d1c9450b5..034d11e2ce 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -155,6 +155,6 @@ typedef union /* Extra attributes for the cleanup functions. */ -#define __cleanup_fct_attribute __attribute ((regparm (1))) +#define __cleanup_fct_attribute __attribute__ ((regparm (1))) #endif /* bits/pthreadtypes.h */ |