From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 05:24:12 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9681A106568E; Fri,  7 Nov 2008 05:24:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59F3C1065680
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 05:24:12 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 492028FC16
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 05:24:12 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA75OCef093945
	for <perforce@freebsd.org>; Fri, 7 Nov 2008 05:24:12 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA75OClI093943
	for perforce@freebsd.org; Fri, 7 Nov 2008 05:24:12 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 7 Nov 2008 05:24:12 GMT
Message-Id: <200811070524.mA75OClI093943@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152614 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Nov 2008 05:24:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=152614

Change 152614 by peter@peter_hammer on 2008/11/07 05:24:12

	Hack.  AIX apparently has an extra _ in its sigpending/sigsuspend names.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcsignal.c#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#7 (text+ko) ====

@@ -238,6 +238,10 @@
    return res.isError ? -1 : res.res;
 }
 #elif defined(VGO_aix5) || (defined(VGO_freebsd) && __FreeBSD__ < 7)
+#if defined(VGO_freebsd)
+#define __NR__sigpending __NR_sigpending
+#define __NR__sigsuspend __NR_sigsuspend
+#endif
 /* The general idea is:
    - use sigpending to find out which signals are pending
    - choose one
@@ -327,6 +331,10 @@
 
   return i;
 }
+#if defined(VGO_freebsd)
+#undef __NR__sigpending
+#undef __NR__sigsuspend
+#endif
 
 #else
 #  error Unknown OS