[PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2)

Jakub Jelinek jakub@redhat.com
Fri Sep 10 17:44:00 GMT 2004


On Fri, Sep 10, 2004 at 07:21:12PM +0200, Jakub Jelinek wrote:
> Hi!
> 
> This seems to work for me in both C++ and C.

Argh, testing error, it breaks C.

2004-09-10  Jakub Jelinek  <jakub@redhat.com>

	* misc/sys/cdefs.h (__REDIRECT_NTH): Change order of __THROW and
	__asm__ for C++.  [BZ #377]

--- libc/misc/sys/cdefs.h.jj	2004-09-10 19:10:03.000000000 +0200
+++ libc/misc/sys/cdefs.h	2004-09-10 19:42:06.806340737 +0200
@@ -159,8 +159,13 @@
 #if defined __GNUC__ && __GNUC__ >= 2
 
 # define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
-# define __REDIRECT_NTH(name, proto, alias) \
+# ifdef __cplusplus
+#  define __REDIRECT_NTH(name, proto, alias) \
+     name proto __THROW __asm__ (__ASMNAME (#alias))
+# else
+#  define __REDIRECT_NTH(name, proto, alias) \
      name proto __asm__ (__ASMNAME (#alias)) __THROW
+# endif
 # define __ASMNAME(cname)  __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
 # define __ASMNAME2(prefix, cname) __STRING (prefix) cname
 


	Jakub



More information about the Libc-hacker mailing list