From owner-p4-projects@FreeBSD.ORG  Fri Oct 24 04:02:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 745121065675; Fri, 24 Oct 2008 04:02:04 +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 2CCA31065670
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 04:02:04 +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 1B5438FC1C
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 04:02:04 +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 m9O423QY054778
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 04:02:03 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9O423Be054776
	for perforce@freebsd.org; Fri, 24 Oct 2008 04:02:03 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 24 Oct 2008 04:02:03 GMT
Message-Id: <200810240402.m9O423Be054776@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 151841 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, 24 Oct 2008 04:02:05 -0000

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

Change 151841 by peter@peter_cheese on 2008/10/24 04:01:31

	Tidy up a little

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#7 (text+ko) ====

@@ -286,6 +286,9 @@
 #define FAILURE       (status->what == SsComplete &&  status->sres.isError)
 #define SWHAT         (status->what)
 #define RES           (getRES(status))
+#ifdef VGO_freebsd
+#define RES2          (getRES2(status))
+#endif
 #define ERR           (getERR(status))
 
 static inline UWord getRES ( SyscallStatus* st ) {
@@ -293,6 +296,13 @@
    vg_assert(!st->sres.isError);
    return st->sres.res;
 }
+#ifdef VGO_freebsd
+static inline UWord getRES2 ( SyscallStatus* st ) {
+   vg_assert(st->what == SsComplete);
+   vg_assert(!st->sres.isError);
+   return st->sres.res2;
+}
+#endif
 
 static inline UWord getERR ( SyscallStatus* st ) {
    vg_assert(st->what == SsComplete);
@@ -300,15 +310,6 @@
    return st->sres.err;
 }
 
-#ifdef VGO_freebsd
-/* FreeBSD syscalls have TWO return values! */
-#define RES2          (getRES(status))
-static inline UWord getRES2 ( SyscallStatus* st ) {
-   vg_assert(st->what == SsComplete);
-   vg_assert(!st->sres.isError);
-   return st->sres.res2;
-}
-#endif