Fix compiling.

10 files changed, 29 insertions, 25 deletions

diff --git a/tools/regression/mqueue/mqtest1/Makefile b/tools/regression/mqueue/mqtest1/Makefile
index 4180591..4e04d1d 100644
--- a/tools/regression/mqueue/mqtest1/Makefile
+++ b/tools/regression/mqueue/mqtest1/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=mqtest1
-LDADD+=
+LDADD+=-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
diff --git a/tools/regression/mqueue/mqtest1/mqtest1.c b/tools/regression/mqueue/mqtest1/mqtest1.c
index 8026230..8551b9f 100644
--- a/tools/regression/mqueue/mqtest1/mqtest1.c
+++ b/tools/regression/mqueue/mqtest1/mqtest1.c
@@ -12,13 +12,13 @@ int main()
 {
 	struct mq_attr attr, attr2;
 	struct sigevent sigev;
-	int mq;
+	mqd_t mq;
 	int status;
 
 	attr.mq_maxmsg  = 2;
 	attr.mq_msgsize = 100;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == -1)
+	if (mq == (mqd_t)-1)
 		err(1, "mq_open");
 	status = mq_unlink(MQNAME);
 	if (status)
diff --git a/tools/regression/mqueue/mqtest2/Makefile b/tools/regression/mqueue/mqtest2/Makefile
index c9e52d9..9d1b92c 100644
--- a/tools/regression/mqueue/mqtest2/Makefile
+++ b/tools/regression/mqueue/mqtest2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=mqtest2
-LDADD+=
+LDADD+=-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
diff --git a/tools/regression/mqueue/mqtest2/mqtest2.c b/tools/regression/mqueue/mqtest2/mqtest2.c
index 3ccdc9f..f37af20 100644
--- a/tools/regression/mqueue/mqtest2/mqtest2.c
+++ b/tools/regression/mqueue/mqtest2/mqtest2.c
@@ -18,14 +18,15 @@ void alarmhandler(int sig)
 int main()
 {
 	struct mq_attr attr;
-	int mq, status, pid;
+	mqd_t mq;
+	int status, pid;
 	
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;
 	attr.mq_msgsize = 128;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == -1)
+	if (mq == (mqd_t)-1)
 		err(1, "mq_open");
 	status = mq_getattr(mq, &attr);
 	if (status)
@@ -40,7 +41,7 @@ int main()
 		signal(SIGALRM, alarmhandler);
 
 		mq = mq_open(MQNAME, O_RDWR);
-		if (mq == -1)
+		if (mq == (mqd_t)-1)
 			err(1, "child: mq_open");
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
diff --git a/tools/regression/mqueue/mqtest3/Makefile b/tools/regression/mqueue/mqtest3/Makefile
index f36e9e9..d4ea9fa 100644
--- a/tools/regression/mqueue/mqtest3/Makefile
+++ b/tools/regression/mqueue/mqtest3/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=mqtest3
-LDADD+=
+LDADD+=-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
diff --git a/tools/regression/mqueue/mqtest3/mqtest3.c b/tools/regression/mqueue/mqtest3/mqtest3.c
index e9c67fb..e2d8a9e 100644
--- a/tools/regression/mqueue/mqtest3/mqtest3.c
+++ b/tools/regression/mqueue/mqtest3/mqtest3.c
@@ -18,7 +18,8 @@ void sighandler(int sig)
 
 int main()
 {
-	int mq, status;
+	mqd_t mq;
+	int status;
 	struct mq_attr attr;
 	int pid;
 	fd_set set;
@@ -28,7 +29,7 @@ int main()
 	attr.mq_maxmsg  = 5;
 	attr.mq_msgsize = 128;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == -1)
+	if (mq == (mqd_t)-1)
 		err(1, "mq_open()");
 	status = mq_getattr(mq, &attr);
 	if (status)
@@ -44,14 +45,14 @@ int main()
 		signal(SIGALRM, sighandler);
 
 		mq = mq_open(MQNAME, O_RDWR);
-		if (mq == -1)
+		if (mq == (mqd_t)-1)
 			err(1, "child process: mq_open");
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			FD_ZERO(&set);
-			FD_SET(mq, &set);
+			FD_SET(__mq_oshandle(mq), &set);
 			alarm(3);
-			status = select(mq+1, &set, NULL, NULL, NULL);
+			status = select(__mq_oshandle(mq)+1, &set, NULL, NULL, NULL);
 			if (status != 1)
 				err(1, "child process: select()");
 			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
@@ -81,8 +82,8 @@ int main()
 			}
 			alarm(3);
 			FD_ZERO(&set);
-			FD_SET(mq, &set);
-			status = select(mq+1, NULL, &set, NULL, NULL);
+			FD_SET(__mq_oshandle(mq), &set);
+			status = select(__mq_oshandle(mq)+1, NULL, &set, NULL, NULL);
 			if (status != 1)
 				err(1, "select()");
 			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
diff --git a/tools/regression/mqueue/mqtest4/Makefile b/tools/regression/mqueue/mqtest4/Makefile
index 14c97f6..3dfec4d 100644
--- a/tools/regression/mqueue/mqtest4/Makefile
+++ b/tools/regression/mqueue/mqtest4/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=mqtest4
-LDADD+=
+LDADD+=-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
diff --git a/tools/regression/mqueue/mqtest4/mqtest4.c b/tools/regression/mqueue/mqtest4/mqtest4.c
index 8269957..a49c210 100644
--- a/tools/regression/mqueue/mqtest4/mqtest4.c
+++ b/tools/regression/mqueue/mqtest4/mqtest4.c
@@ -19,7 +19,8 @@ void sighandler(int sig)
 
 int main()
 {
-	int mq, status;
+	mqd_t mq;
+	int status;
 	struct mq_attr attr;
 	int pid;
 	fd_set set;
@@ -31,7 +32,7 @@ int main()
 	attr.mq_maxmsg  = 5;
 	attr.mq_msgsize = 128;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == -1)
+	if (mq == (mqd_t) -1)
 		err(1, "mq_open()");
 	status = mq_getattr(mq, &attr);
 	if (status)
@@ -44,9 +45,9 @@ int main()
 		mq_close(mq);
 		kq = kqueue();
 		mq = mq_open(MQNAME, O_RDWR);
-		if (mq == -1)
+		if (mq == (mqd_t)-1)
 			err(1, "child: mq_open");
-		EV_SET(&kev, mq, EVFILT_READ, EV_ADD, 0, 0, 0);
+		EV_SET(&kev, __mq_oshandle(mq), EVFILT_READ, EV_ADD, 0, 0, 0);
 		status = kevent(kq, &kev, 1, NULL, 0, NULL);
 		if (status == -1)
 			err(1, "child: kevent");
@@ -78,7 +79,7 @@ int main()
 
 		signal(SIGALRM, sighandler);
 		kq = kqueue();
-		EV_SET(&kev, mq, EVFILT_WRITE, EV_ADD, 0, 0, 0);
+		EV_SET(&kev, __mq_oshandle(mq), EVFILT_WRITE, EV_ADD, 0, 0, 0);
 		status = kevent(kq, &kev, 1, NULL, 0, NULL);
 		if (status == -1)
 			err(1, "kevent");
diff --git a/tools/regression/mqueue/mqtest5/Makefile b/tools/regression/mqueue/mqtest5/Makefile
index b43c415..25f46ad 100644
--- a/tools/regression/mqueue/mqtest5/Makefile
+++ b/tools/regression/mqueue/mqtest5/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=mqtest5
-LDADD+=
+LDADD+=-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
diff --git a/tools/regression/mqueue/mqtest5/mqtest5.c b/tools/regression/mqueue/mqtest5/mqtest5.c
index 2bb2625..adf54dc 100644
--- a/tools/regression/mqueue/mqtest5/mqtest5.c
+++ b/tools/regression/mqueue/mqtest5/mqtest5.c
@@ -20,7 +20,8 @@ void sighandler(int sig)
 
 int main()
 {
-	int mq, status;
+	mqd_t mq;
+	int status;
 	struct mq_attr attr;
 	int pid;
 	sigset_t set;
@@ -40,7 +41,7 @@ int main()
 	attr.mq_maxmsg  = 5;
 	attr.mq_msgsize = 128;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == -1)
+	if (mq == (mqd_t)-1)
 		err(1, "mq_open()");
 	status = mq_getattr(mq, &attr);
 	if (status)
@@ -59,7 +60,7 @@ int main()
 
 		mq_close(mq);
 		mq = mq_open(MQNAME, O_RDWR | O_NONBLOCK);
-		if (mq == -1)
+		if (mq == (mqd_t)-1)
 			err(1, "child: mq_open");
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {