Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Jan 2017 08:35:01 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r312027 - stable/11/contrib/netbsd-tests/lib/libc/ttyio
Message-ID:  <201701130835.v0D8Z1SK049155@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Fri Jan 13 08:35:01 2017
New Revision: 312027
URL: https://svnweb.freebsd.org/changeset/base/312027

Log:
  MFC r311871:
  
  Merge ^/vendor/NetBSD/tests/dist@r311868
  
  This is the vendor accepted version of ^/head@r311245

Modified:
  stable/11/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c
==============================================================================
--- stable/11/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c	Fri Jan 13 08:31:55 2017	(r312026)
+++ stable/11/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c	Fri Jan 13 08:35:01 2017	(r312027)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ttyio.c,v 1.2 2011/04/19 20:07:53 martin Exp $ */
+/*	$NetBSD: t_ttyio.c,v 1.3 2017/01/10 01:31:40 christos Exp $ */
 
 /*
  * Copyright (c) 2001, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ttyio.c,v 1.2 2011/04/19 20:07:53 martin Exp $");
+__RCSID("$NetBSD: t_ttyio.c,v 1.3 2017/01/10 01:31:40 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -150,11 +150,9 @@ ATF_TC_BODY(ioctl, tc)
 	/* wait for last child */
 	sa.sa_handler = SIG_DFL;
 	REQUIRE_ERRNO(sigaction(SIGCHLD, &sa, NULL), -1);
-	(void) wait(NULL);
+	(void)wait(NULL);
 
-#ifdef	__FreeBSD__
 	(void)close(s);
-#endif
 	ATF_REQUIRE_EQ(rc, 0);
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701130835.v0D8Z1SK049155>