* [PATCH] Fix NPTL headers with -ansi -fexceptions
@ 2005-04-05 21:13 Jakub Jelinek
2005-04-05 21:34 ` Roland McGrath
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2005-04-05 21:13 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
Hi!
This patch fixes
/usr/include/pthread.h:530: error: syntax error before 'void'
and similar error in bits/libc-lock.h with -ansi -fexceptions.
2005-04-05 Jakub Jelinek <jakub@redhat.com>
* sysdeps/pthread/pthread.h (__pthread_cleanup_routine): Use
__inline instead of inline.
* sysdeps/pthread/bits/libc-lock.h (__libc_cleanup_routine): Likewise.
--- libc/nptl/sysdeps/pthread/pthread.h.jj 2005-02-08 17:17:13.000000000 +0100
+++ libc/nptl/sysdeps/pthread/pthread.h 2005-04-05 23:09:42.000000000 +0200
@@ -527,7 +527,7 @@ class __pthread_cleanup_class
function the compiler is free to decide inlining the change when
needed or fall back on the copy which must exist somewhere
else. */
-extern inline void
+extern __inline void
__pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame)
{
if (__frame->__do_it)
--- libc/nptl/sysdeps/pthread/bits/libc-lock.h.jj 2005-03-01 10:34:40.000000000 +0100
+++ libc/nptl/sysdeps/pthread/bits/libc-lock.h 2005-04-05 23:10:14.000000000 +0200
@@ -1,5 +1,5 @@
/* libc-internal interface for mutex locks. NPTL version.
- Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1996-2001, 2002, 2003, 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
@@ -408,7 +408,7 @@ extern void _pthread_cleanup_pop_restore
/* Normal cleanup handling, based on C cleanup attribute. */
-extern inline void
+extern __inline void
__libc_cleanup_routine (struct __pthread_cleanup_frame *f)
{
if (f->__do_it)
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix NPTL headers with -ansi -fexceptions
2005-04-05 21:13 [PATCH] Fix NPTL headers with -ansi -fexceptions Jakub Jelinek
@ 2005-04-05 21:34 ` Roland McGrath
0 siblings, 0 replies; 2+ messages in thread
From: Roland McGrath @ 2005-04-05 21:34 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Ulrich Drepper, Glibc hackers
> 2005-04-05 Jakub Jelinek <jakub@redhat.com>
>
> * sysdeps/pthread/pthread.h (__pthread_cleanup_routine): Use
> __inline instead of inline.
> * sysdeps/pthread/bits/libc-lock.h (__libc_cleanup_routine): Likewise.
Applied.
Thanks,
Roland
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-04-05 21:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-04-05 21:13 [PATCH] Fix NPTL headers with -ansi -fexceptions Jakub Jelinek
2005-04-05 21:34 ` Roland McGrath
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).