aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-03-07 03:05:08 +0100
committerDuncaen <mail@duncano.de>2017-03-07 03:05:19 +0100
commitde01d68e73f56b51596accd70858fc87510dfa39 (patch)
tree747e01b9acc15e26e27dee9dca7252be86ea3659
parent2bb9f6d18749b5739dceb8ba9f37f380cffb22bf (diff)
downloadlobase-de01d68e73f56b51596accd70858fc87510dfa39.tar.gz
include: add sys/{queue,tree}.h
-rw-r--r--bin/md5/md5.c2
-rw-r--r--include/sys/queue.h (renamed from lib/libopenbsd/openbsd-queue.h)0
-rw-r--r--include/sys/tree.h (renamed from lib/libopenbsd/openbsd-tree.h)0
-rw-r--r--usr.bin/du/du.c4
-rw-r--r--usr.bin/grep/grep.c4
-rw-r--r--usr.bin/paste/paste.c4
-rw-r--r--usr.bin/patch/ed.c4
-rw-r--r--usr.bin/sort/file.c2
8 files changed, 2 insertions, 18 deletions
diff --git a/bin/md5/md5.c b/bin/md5/md5.c
index b2dcc69..e7fa6cd 100644
--- a/bin/md5/md5.c
+++ b/bin/md5/md5.c
@@ -23,7 +23,7 @@
#include <sys/time.h>
#include <sys/types.h>
-#include <openbsd-queue.h>
+#include <sys/queue.h>
#include <netinet/in.h>
#include <ctype.h>
#include <err.h>
diff --git a/lib/libopenbsd/openbsd-queue.h b/include/sys/queue.h
index 5e81fdd..5e81fdd 100644
--- a/lib/libopenbsd/openbsd-queue.h
+++ b/include/sys/queue.h
diff --git a/lib/libopenbsd/openbsd-tree.h b/include/sys/tree.h
index e6502b1..e6502b1 100644
--- a/lib/libopenbsd/openbsd-tree.h
+++ b/include/sys/tree.h
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 76d6b19..95b409c 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -44,11 +44,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_SYS_TREE_H
#include <sys/tree.h>
-#else
-#include <openbsd-tree.h>
-#endif
#include <unistd.h>
#include <util.h>
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 9192066..bdb087b 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -28,11 +28,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#if defined(HAVE_SYS_QUEUE_H)
#include <sys/queue.h>
-#else
-#include <openbsd-queue.h>
-#endif
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index b7b171e..4b00413 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -32,11 +32,7 @@
* SUCH DAMAGE.
*/
-#if defined(HAVE_SYS_QUEUES_h)
#include <sys/queue.h>
-#else
-#include "openbsd-queue.h"
-#endif
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/patch/ed.c b/usr.bin/patch/ed.c
index 68284b9..baac4e5 100644
--- a/usr.bin/patch/ed.c
+++ b/usr.bin/patch/ed.c
@@ -16,11 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(HAVE_SYS_QUEUE_H)
#include <sys/queue.h>
-#else
-#include "openbsd-queue.h"
-#endif
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index 88c8bd8..d7cf004 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -30,7 +30,7 @@
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <openbsd-queue.h>
+#include <sys/queue.h>
#include <err.h>
#include <fcntl.h>