From owner-svn-src-head@FreeBSD.ORG  Thu Oct 23 08:00:00 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 94293A8A;
 Thu, 23 Oct 2014 08:00:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 80AECAFF;
 Thu, 23 Oct 2014 08:00:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N80073082881;
 Thu, 23 Oct 2014 08:00:00 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N8006Q082880;
 Thu, 23 Oct 2014 08:00:00 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201410230800.s9N8006Q082880@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 23 Oct 2014 08:00:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273534 - head/contrib/netbsd-tests/lib/libc/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Oct 2014 08:00:00 -0000

Author: ngie
Date: Thu Oct 23 07:59:59 2014
New Revision: 273534
URL: https://svnweb.freebsd.org/changeset/base/273534

Log:
  - Mark sig/signo __unused
  - Do not provide a relative path via #include "h_macros.h"
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c

Modified: head/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c	Thu Oct 23 07:54:46 2014	(r273533)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c	Thu Oct 23 07:59:59 2014	(r273534)
@@ -42,12 +42,20 @@ __RCSID("$NetBSD: t_sigaction.c,v 1.2 20
 #include <atf-c.h>
 #include <atf-c/config.h>
 
+#ifdef __NetBSD__
 #include "../../../h_macros.h"
+#else
+#include "h_macros.h"
+#endif
 
 static bool handler_called = false;
 
 static void
+#ifdef __FreeBSD__
+handler(int signo __unused)
+#else
 handler(int signo)
+#endif
 {
     handler_called = true;
 }
@@ -80,7 +88,11 @@ wait_and_check_child(const pid_t pid, co
 }
 
 static void
+#ifdef __FreeBSD__
+catch(int sig __unused)
+#else
 catch(int sig)
+#endif
 {
 	return;
 }