From 6e61756bbf707f0626aec12015add8b2b4cf21ee Mon Sep 17 00:00:00 2001
From: kib <kib@FreeBSD.org>
Date: Sun, 9 Oct 2016 12:34:56 +0000
Subject: MFC r306588: Export the mq_getfd_np() and timer_oshandle_np() symbols
 from librt.so.

---
 tests/sys/mqueue/Makefile  |  4 ++--
 tests/sys/mqueue/mqtest3.c | 10 ++++++----
 tests/sys/mqueue/mqtest4.c |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'tests/sys')

diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile
index ce5033c..251c497 100644
--- a/tests/sys/mqueue/Makefile
+++ b/tests/sys/mqueue/Makefile
@@ -10,8 +10,8 @@ CFLAGS+=	-I${SRCTOP}/tests
 
 PROGS+=		mqtest1
 PROGS+=		mqtest2
-#PROGS+=		mqtest3
-#PROGS+=		mqtest4
+PROGS+=		mqtest3
+PROGS+=		mqtest4
 PROGS+=		mqtest5
 
 LIBADD+=	rt
diff --git a/tests/sys/mqueue/mqtest3.c b/tests/sys/mqueue/mqtest3.c
index c4b849e..3e20c4d 100644
--- a/tests/sys/mqueue/mqtest3.c
+++ b/tests/sys/mqueue/mqtest3.c
@@ -62,9 +62,10 @@ main(void)
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			FD_ZERO(&set);
-			FD_SET(__mq_oshandle(mq), &set);
+			FD_SET(mq_getfd_np(mq), &set);
 			alarm(3);
-			status = select(__mq_oshandle(mq)+1, &set, NULL, NULL, NULL);
+			status = select(mq_getfd_np(mq) + 1, &set, NULL,
+			    NULL, NULL);
 			if (status != 1)
 				err(1, "child process: select()");
 			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
@@ -94,8 +95,9 @@ main(void)
 			}
 			alarm(3);
 			FD_ZERO(&set);
-			FD_SET(__mq_oshandle(mq), &set);
-			status = select(__mq_oshandle(mq)+1, NULL, &set, NULL, NULL);
+			FD_SET(mq_getfd_np(mq), &set);
+			status = select(mq_getfd_np(mq) + 1, NULL, &set,
+			    NULL, NULL);
 			if (status != 1)
 				err(1, "select()");
 			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
diff --git a/tests/sys/mqueue/mqtest4.c b/tests/sys/mqueue/mqtest4.c
index 474d212..b0b3952 100644
--- a/tests/sys/mqueue/mqtest4.c
+++ b/tests/sys/mqueue/mqtest4.c
@@ -57,7 +57,7 @@ main(void)
 		mq = mq_open(MQNAME, O_RDWR);
 		if (mq == (mqd_t)-1)
 			err(1, "child: mq_open");
-		EV_SET(&kev, __mq_oshandle(mq), EVFILT_READ, EV_ADD, 0, 0, 0);
+		EV_SET(&kev, mq_getfd_np(mq), EVFILT_READ, EV_ADD, 0, 0, 0);
 		status = kevent(kq, &kev, 1, NULL, 0, NULL);
 		if (status == -1)
 			err(1, "child: kevent");
@@ -89,7 +89,7 @@ main(void)
 
 		signal(SIGALRM, sighandler);
 		kq = kqueue();
-		EV_SET(&kev, __mq_oshandle(mq), EVFILT_WRITE, EV_ADD, 0, 0, 0);
+		EV_SET(&kev, mq_getfd_np(mq), EVFILT_WRITE, EV_ADD, 0, 0, 0);
 		status = kevent(kq, &kev, 1, NULL, 0, NULL);
 		if (status == -1)
 			err(1, "kevent");
-- 
cgit v1.1