From c9e7bdab9c84e2d2ecd7a38d36e4f3943488e6dd Mon Sep 17 00:00:00 2001
From: Robert Nagy <robert@openbsd.org>
Date: Fri, 3 Apr 2020 16:09:24 +0200
Subject: [PATCH] add OpenBSD support

---
 src/timerfd_ctx.h       |  4 ++++
 test/epoll-test.c       |  4 ++--
 test/eventfd-ctx-test.c |  2 ++
 test/microatf/atf-c.h   | 10 +++++++++-
 test/timerfd-test.c     |  2 ++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/timerfd_ctx.h b/src/timerfd_ctx.h
index 497c730..df1544a 100644
--- a/src/timerfd_ctx.h
+++ b/src/timerfd_ctx.h
@@ -1,7 +1,11 @@
 #ifndef TIMERFD_CTX_H_
 #define TIMERFD_CTX_H_
 
+#ifdef __OpenBSD__
+#include <sys/time.h>
+#else
 #include <sys/timespec.h>
+#endif
 
 #include <errno.h>
 #include <stdatomic.h>
diff --git a/test/epoll-test.c b/test/epoll-test.c
index 7157d3e..8ea46ab 100644
--- a/test/epoll-test.c
+++ b/test/epoll-test.c
@@ -562,7 +562,7 @@ ATF_TC_BODY_FD_LEAKCHECK(epoll__no_epollin_on_closed_empty_pipe, tcptr)
 ATF_TC_WITHOUT_HEAD(epoll__write_to_pipe_until_full);
 ATF_TC_BODY_FD_LEAKCHECK(epoll__write_to_pipe_until_full, tcptr)
 {
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 	atf_tc_skip("test assumes a pipe buffer size of 65536");
 #endif
 	int ep = epoll_create1(EPOLL_CLOEXEC);
@@ -764,7 +764,7 @@ ATF_TC_BODY_FD_LEAKCHECK(epoll__socket_shutdown, tcptr)
 ATF_TC_WITHOUT_HEAD(epoll__epollhup_on_fresh_socket);
 ATF_TC_BODY_FD_LEAKCHECK(epoll__epollhup_on_fresh_socket, tcptr)
 {
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 	atf_tc_skip("NetBSD does not support EV_FORCEONESHOT");
 #endif
 	int sock = socket(PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
diff --git a/test/eventfd-ctx-test.c b/test/eventfd-ctx-test.c
index 242ca97..93239e9 100644
--- a/test/eventfd-ctx-test.c
+++ b/test/eventfd-ctx-test.c
@@ -16,7 +16,9 @@
 
 #include "atf-c-leakcheck.h"
 
+#ifndef nitems
 #define nitems(x) (sizeof((x)) / sizeof((x)[0]))
+#endif
 
 ATF_TC_WITHOUT_HEAD(eventfd__init_terminate);
 ATF_TC_BODY_FD_LEAKCHECK(eventfd__init_terminate, tc)
diff --git a/test/microatf/atf-c.h b/test/microatf/atf-c.h
index 12fefcd..34efa2e 100644
--- a/test/microatf/atf-c.h
+++ b/test/microatf/atf-c.h
@@ -13,6 +13,14 @@
 
 #include <unistd.h>
 
+#ifdef __OpenBSD__
+#define STAILQ_ENTRY SIMPLEQ_ENTRY
+#define STAILQ_FOREACH SIMPLEQ_FOREACH
+#define STAILQ_HEAD SIMPLEQ_HEAD
+#define STAILQ_HEAD_INITIALIZER SIMPLEQ_HEAD_INITIALIZER
+#define STAILQ_INSERT_TAIL SIMPLEQ_INSERT_TAIL
+#endif
+
 /**/
 
 #define MICROATF_ATTRIBUTE_UNUSED __attribute__((__unused__))
@@ -133,7 +141,7 @@ microatf_context_write_result_pack(microatf_context_t *context,
 		return;
 	}
 
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 	fclose(context->result_file);
 	context->result_file = fopen(context->result_file_path, "w");
 #else
diff --git a/test/timerfd-test.c b/test/timerfd-test.c
index 3abc485..6d3c3d0 100644
--- a/test/timerfd-test.c
+++ b/test/timerfd-test.c
@@ -6,8 +6,10 @@
 
 #ifndef __linux__
 #include <sys/event.h>
+#ifndef __OpenBSD__
 #include <sys/timespec.h>
 #endif
+#endif
 
 #include <sys/param.h>
 #include <sys/select.h>