Author: ngie
Date: Tue Jan 10 10:16:59 2017
New Revision: 311871
URL: https://svnweb.freebsd.org/changeset/base/311871
Log:
Merge ^/vendor/NetBSD/tests/dist@r311868
This is the vendor accepted version of ^/head@r311245
MFC after: 3 days
Modified:
head/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c
Directory Properties:
head/contrib/netbsd-tests/ (props changed)
Modified: head/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c Tue Jan 10 10:12:36
2017 (r311870)
+++ head/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c Tue Jan 10 10:16:59
2017 (r311871)
@@ -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);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
