From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 11 Dec 2016 16:04:20 -0800
Subject: Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config
---
 pkg/openbsd/include/sys/cdefs.h | 5 +++++
 pkg/openbsd/include/sys/param.h | 3 +++
 pkg/openbsd/include/sys/time.h  | 5 +++++
 3 files changed, 13 insertions(+)
 create mode 100644 pkg/openbsd/include/sys/cdefs.h
 create mode 100644 pkg/openbsd/include/sys/param.h
 create mode 100644 pkg/openbsd/include/sys/time.h

(limited to 'pkg/openbsd/include/sys')

diff --git a/pkg/openbsd/include/sys/cdefs.h b/pkg/openbsd/include/sys/cdefs.h
new file mode 100644
index 00000000..70258b8c
--- /dev/null
+++ b/pkg/openbsd/include/sys/cdefs.h
@@ -0,0 +1,5 @@
+/* only needed for C++ */
+#define __BEGIN_DECLS
+#define __END_DECLS
+
+#define __dead __attribute__((__noreturn__))
diff --git a/pkg/openbsd/include/sys/param.h b/pkg/openbsd/include/sys/param.h
new file mode 100644
index 00000000..3167713c
--- /dev/null
+++ b/pkg/openbsd/include/sys/param.h
@@ -0,0 +1,3 @@
+#include_next <sys/param.h>
+#define ALIGNBYTES (sizeof(uintptr_t) - 1)
+#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
diff --git a/pkg/openbsd/include/sys/time.h b/pkg/openbsd/include/sys/time.h
new file mode 100644
index 00000000..98d5d3a7
--- /dev/null
+++ b/pkg/openbsd/include/sys/time.h
@@ -0,0 +1,5 @@
+#include_next <sys/time.h>
+#define	timespeccmp(tsp, usp, cmp)					\
+	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
+	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
+	    ((tsp)->tv_sec cmp (usp)->tv_sec))
-- 
cgit v1.2.3