From 97c107262c6101de2118e02f559a9885421a9b10 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Wed, 23 Oct 2019 10:33:20 +0200
Subject: [PATCH] Simplify, syslogd unconditionally includes fcntl.h already

No need to check for SYSV (?) to include fcntl.h since syslogd.c already
includes it unconditionally.  If this turns out to be an actual problem
we should probe for fcntl.h in configure and use #ifdef HAVE_FCNTL_H.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 src/klogd.c    | 8 ++------
 src/ksym_mod.c | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/klogd.c b/src/klogd.c
index 4edc032..28fd18c 100644
--- a/src/klogd.c
+++ b/src/klogd.c
@@ -258,16 +258,13 @@
  *	Remove special treatment of the percent sign.
  */
 
-/* Includes. */
+#include "config.h"
+
 #include <errno.h>
 #include <getopt.h>
 #include <signal.h>
 #include <unistd.h>
-#ifdef SYSV
 #include <fcntl.h>
-#else
-#include <sys/msgbuf.h>
-#endif
 #include "klogd.h"
 #include "ksyms.h"
 #include <paths.h>
@@ -277,7 +274,6 @@
 #ifndef TESTING
 #include "pidfile.h"
 #endif
-#include "config.h"
 
 #define __LIBRARY__
 #include <linux/unistd.h>
diff --git a/src/ksym_mod.c b/src/ksym_mod.c
index 92e6e9c..15f094a 100644
--- a/src/ksym_mod.c
+++ b/src/ksym_mod.c
@@ -106,7 +106,7 @@
  *	the first hit.
  */
 
-/* Includes. */
+#include "config.h"
 #include <ctype.h>
 #include <errno.h>
 #include <malloc.h>
@@ -115,11 +115,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
-#ifdef SYSV
 #include <fcntl.h>
-#else
-#include <sys/msgbuf.h>
-#endif
 #include "module.h"
 #include <linux/version.h>
 #include <paths.h>