From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-7892-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 22080 invoked by alias); 10 Sep 2004 17:44:20 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 22042 invoked from network); 10 Sep 2004 17:44:18 -0000
Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26)
  by sourceware.org with SMTP; 10 Sep 2004 17:44:18 -0000
Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i8AHiS3j012473;
	Fri, 10 Sep 2004 19:44:28 +0200
Received: (from jakub@localhost)
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i8AHiSRV012471;
	Fri, 10 Sep 2004 19:44:28 +0200
Date: Fri, 10 Sep 2004 17:44:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Richard Henderson <rth@redhat.com>,
   Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2)
Message-ID: <20040910174427.GY30497@sunsite.ms.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
References: <20040910172112.GX30497@sunsite.ms.mff.cuni.cz>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040910172112.GX30497@sunsite.ms.mff.cuni.cz>
User-Agent: Mutt/1.4.1i
X-SW-Source: 2004-09/txt/msg00043.txt.bz2

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