diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2018-11-23 02:53:57 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-11-23 14:42:07 +1100 |
commit | 4da58d58736b065b1182b563d10ad6765d811c6d (patch) | |
tree | 2257c6c661f77ea6ac8d2a69c7a7e6b21e349556 /regress | |
parent | c721d5877509875c8515df0215fa1dab862013bc (diff) |
upstream: Remove now-unneeded ifdef SIGINFO around handler since it is
now always used for SIGUSR1 even when SIGINFO is not defined. This will make
things simpler in -portable.
OpenBSD-Regress-ID: 4ff0265b335820b0646d37beb93f036ded0dc43f
Diffstat (limited to 'regress')
-rw-r--r-- | regress/unittests/test_helper/test_helper.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c index 39bab77f5..e7a47b265 100644 --- a/regress/unittests/test_helper/test_helper.c +++ b/regress/unittests/test_helper/test_helper.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: test_helper.c,v 1.10 2018/11/22 08:59:11 dtucker Exp $ */ | 1 | /* $OpenBSD: test_helper.c,v 1.11 2018/11/23 02:53:57 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2011 Damien Miller <djm@mindrot.org> |
4 | * | 4 | * |
@@ -228,7 +228,6 @@ test_info(char *s, size_t len) | |||
228 | *subtest_info != '\0' ? " - " : "", subtest_info); | 228 | *subtest_info != '\0' ? " - " : "", subtest_info); |
229 | } | 229 | } |
230 | 230 | ||
231 | #ifdef SIGINFO | ||
232 | static void | 231 | static void |
233 | siginfo(int unused __attribute__((__unused__))) | 232 | siginfo(int unused __attribute__((__unused__))) |
234 | { | 233 | { |
@@ -237,7 +236,6 @@ siginfo(int unused __attribute__((__unused__))) | |||
237 | test_info(buf, sizeof(buf)); | 236 | test_info(buf, sizeof(buf)); |
238 | atomicio(vwrite, STDERR_FILENO, buf, strlen(buf)); | 237 | atomicio(vwrite, STDERR_FILENO, buf, strlen(buf)); |
239 | } | 238 | } |
240 | #endif | ||
241 | 239 | ||
242 | void | 240 | void |
243 | test_start(const char *n) | 241 | test_start(const char *n) |