diff options
| author | ngie <ngie@FreeBSD.org> | 2014-11-17 13:39:00 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2014-11-17 13:39:00 +0000 |
| commit | 8177391ac84430aeb73987802ea58e8bfe9ba72b (patch) | |
| tree | 5afba437c6e7f13eeeb63c7313aa547c8c24536d /contrib/netbsd-tests/lib/libpthread | |
| parent | e5d03fbe91f9f0c573d55b2d87f2a1eb517ba14b (diff) | |
| download | FreeBSD-src-8177391ac84430aeb73987802ea58e8bfe9ba72b.zip FreeBSD-src-8177391ac84430aeb73987802ea58e8bfe9ba72b.tar.gz | |
Mechanically replace #if defined(__FreeBSD__) and #if defined(__NetBSD__) with
their #ifdef equivalents for everything changed in contrib/netbsd-tests. There
are some items from the vendor tree that use #if defined(__FreeBSD__) or
#if defined(__NetBSD__) which are being left alone
Requested by: bde, rpaulo
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'contrib/netbsd-tests/lib/libpthread')
| -rw-r--r-- | contrib/netbsd-tests/lib/libpthread/h_atexit.c | 2 | ||||
| -rw-r--r-- | contrib/netbsd-tests/lib/libpthread/t_detach.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/netbsd-tests/lib/libpthread/h_atexit.c b/contrib/netbsd-tests/lib/libpthread/h_atexit.c index edcf066..29b8775 100644 --- a/contrib/netbsd-tests/lib/libpthread/h_atexit.c +++ b/contrib/netbsd-tests/lib/libpthread/h_atexit.c @@ -180,7 +180,7 @@ main(int argc, char *argv[]) exiting_state = 5; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ ASSERT(0 == atexit(normal_handler_0)); ASSERT(0 == atexit(normal_handler_1)); ASSERT(0 == __cxa_atexit(cxa_handler_4, &arg_1, dso_handle_1)); diff --git a/contrib/netbsd-tests/lib/libpthread/t_detach.c b/contrib/netbsd-tests/lib/libpthread/t_detach.c index aeed671..8922d5a 100644 --- a/contrib/netbsd-tests/lib/libpthread/t_detach.c +++ b/contrib/netbsd-tests/lib/libpthread/t_detach.c @@ -75,7 +75,7 @@ ATF_TC_BODY(pthread_detach, tc) rv = pthread_join(t, NULL); ATF_REQUIRE(rv == EINVAL); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("PR # 191906: fails with EINVAL, not ESRCH"); #endif |
