svn commit: r276046 - head/contrib/netbsd-tests/lib/libc/stdlib
Garrett Cooper
ngie at FreeBSD.org
Sun Dec 21 23:47:31 UTC 2014
Author: ngie
Date: Sun Dec 21 23:47:30 2014
New Revision: 276046
URL: https://svnweb.freebsd.org/changeset/base/276046
Log:
Add __FreeBSD_version guards around hsearch_r to ease MFCing the code to
stable/10
It was added when __FreeBSD_version was ~1100027
Modified:
head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c
Modified: head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Sun Dec 21 23:45:13 2014 (r276045)
+++ head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Sun Dec 21 23:47:30 2014 (r276046)
@@ -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();
}
More information about the svn-src-head
mailing list