diff options
| author | ngie <ngie@FreeBSD.org> | 2014-12-21 23:47:30 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2014-12-21 23:47:30 +0000 |
| commit | b6d7453b2baf0d21d3940778d6afac3bc20d88c5 (patch) | |
| tree | 57e63537ed6dc4225c5e74a2c0298acfe980c26b /contrib/netbsd-tests | |
| parent | b2b5ecce72fe9a6023287bfb361018257cf218c3 (diff) | |
| download | FreeBSD-src-b6d7453b2baf0d21d3940778d6afac3bc20d88c5.zip FreeBSD-src-b6d7453b2baf0d21d3940778d6afac3bc20d88c5.tar.gz | |
Add __FreeBSD_version guards around hsearch_r to ease MFCing the code to
stable/10
It was added when __FreeBSD_version was ~1100027
Diffstat (limited to 'contrib/netbsd-tests')
| -rw-r--r-- | contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c b/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c index d665967..a0e77d3 100644 --- a/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c +++ b/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c @@ -231,6 +231,7 @@ ATF_TC_BODY(hsearch_two, tc) hdestroy(); } +#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version #ifdef __NetBSD__ ATF_TC(hsearch_r_basic); ATF_TC_HEAD(hsearch_r_basic, tc) @@ -385,6 +386,7 @@ ATF_TC_BODY(hsearch_r_two, tc) hdestroy_r(&t); } +#endif ATF_TP_ADD_TCS(tp) { @@ -395,13 +397,15 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, hsearch_duplicate); ATF_TP_ADD_TC(tp, hsearch_nonexistent); ATF_TP_ADD_TC(tp, hsearch_two); - + +#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version #ifdef __NetBSD__ ATF_TP_ADD_TC(tp, hsearch_r_basic); #endif ATF_TP_ADD_TC(tp, hsearch_r_duplicate); ATF_TP_ADD_TC(tp, hsearch_r_nonexistent); ATF_TP_ADD_TC(tp, hsearch_r_two); +#endif return atf_no_error(); } |
