From 72e8fe4e89162370dce4742f1b69ebfec3ac3928 Mon Sep 17 00:00:00 2001
From: Saya Sugiura <ssugiura@jp.adit-jv.com>
Date: Mon, 11 May 2020 14:07:08 +0900
Subject: network trace: Include necessary headers

Some components which links dlt seem to depend on following headers,
which will be included by mqueue.h.
  - sys/types.h
  - fcntl.h
So explicitly include them if mqueue interface is not supported in
dlt_user.h. Also two headers are removed if dlt_used.h is included.

Signed-off-by: Saya Sugiura <ssugiura@jp.adit-jv.com>
---
 include/dlt/dlt_user.h                    | 3 +++
 src/console/dlt-control.c                 | 2 --
 src/daemon/dlt_daemon_client.c            | 2 --
 src/daemon/dlt_daemon_common.c            | 2 --
 src/daemon/dlt_daemon_serial.c            | 2 --
 src/daemon/dlt_daemon_socket.c            | 2 --
 src/tests/dlt-test-client.c               | 2 --
 src/tests/dlt-test-multi-process-client.c | 2 --
 src/tests/dlt-test-stress-client.c        | 2 --
 9 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
index 41484b6..a3741fa 100644
--- a/include/dlt/dlt_user.h
+++ b/include/dlt/dlt_user.h
@@ -76,6 +76,9 @@
 
 #ifdef DLT_NETWORK_TRACE_ENABLE
 #   include <mqueue.h>
+#else
+#    include <sys/types.h>
+#    include <fcntl.h>
 #endif
 
 #   include <pthread.h>
diff --git a/src/console/dlt-control.c b/src/console/dlt-control.c
index d1edba9..190793a 100644
--- a/src/console/dlt-control.c
+++ b/src/console/dlt-control.c
@@ -54,8 +54,6 @@
 
 #include <ctype.h>      /* for isprint() */
 #include <stdlib.h>     /* for atoi() */
-#include <sys/stat.h>   /* for S_IRUSR, S_IWUSR, S_IRGRP, S_IROTH */
-#include <fcntl.h>      /* for open() */
 #include <sys/uio.h>    /* for writev() */
 #include <string.h>     /* for open() */
 
diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c
index c47c808..3560910 100644
--- a/src/daemon/dlt_daemon_client.c
+++ b/src/daemon/dlt_daemon_client.c
@@ -33,7 +33,6 @@
 #include <stdlib.h>     /* for atoi() and exit() */
 #include <string.h>     /* for memset() */
 #include <unistd.h>     /* for close() */
-#include <fcntl.h>
 #include <signal.h>
 #include <syslog.h>
 #include <errno.h>
@@ -42,7 +41,6 @@
 #ifdef linux
 #   include <sys/timerfd.h>
 #endif
-#include <sys/stat.h>
 #include <sys/time.h>
 #if defined(linux) && defined(__NR_statx)
 #   include <linux/stat.h>
diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index d96d8f2..f628cd5 100644
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -71,9 +71,7 @@
 #include <syslog.h>
 #include <errno.h>
 #include <unistd.h>
-#include <fcntl.h>
 
-#include <sys/types.h>  /* send() */
 #include <sys/socket.h> /* send() */
 
 #include "dlt_types.h"
diff --git a/src/daemon/dlt_daemon_serial.c b/src/daemon/dlt_daemon_serial.c
index 4cdd7b4..36b7990 100644
--- a/src/daemon/dlt_daemon_serial.c
+++ b/src/daemon/dlt_daemon_serial.c
@@ -57,9 +57,7 @@
 #include <syslog.h>
 #include <errno.h>
 #include <unistd.h>
-#include <fcntl.h>
 
-#include <sys/types.h>  /* send() */
 #include <sys/socket.h> /* send() */
 
 #include "dlt-daemon.h"
diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c
index a2cf08a..50bf68e 100644
--- a/src/daemon/dlt_daemon_socket.c
+++ b/src/daemon/dlt_daemon_socket.c
@@ -34,7 +34,6 @@
 #include <stdlib.h>     /* for atoi() and exit() */
 #include <string.h>     /* for memset() */
 #include <unistd.h>     /* for close() */
-#include <fcntl.h>
 #include <signal.h>
 #include <syslog.h>
 #include <errno.h>
@@ -44,7 +43,6 @@
 #ifdef linux
 #   include <sys/timerfd.h>
 #endif
-#include <sys/stat.h>
 #include <sys/time.h>
 #if defined(linux) && defined(__NR_statx)
 #   include <linux/stat.h>
diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c
index 5f5a884..e969df9 100644
--- a/src/tests/dlt-test-client.c
+++ b/src/tests/dlt-test-client.c
@@ -68,8 +68,6 @@
 
 #include <ctype.h>      /* for isprint() */
 #include <stdlib.h>     /* for atoi() */
-#include <sys/stat.h>   /* for S_IRUSR, S_IWUSR, S_IRGRP, S_IROTH */
-#include <fcntl.h>      /* for open() */
 #include <string.h>     /* for strcmp() */
 #include <sys/uio.h>    /* for writev() */
 
diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c
index 0e51b92..f263374 100644
--- a/src/tests/dlt-test-multi-process-client.c
+++ b/src/tests/dlt-test-multi-process-client.c
@@ -48,9 +48,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <time.h>
-#include <fcntl.h>
 #include <sys/uio.h>
-#include <sys/stat.h>
 
 /* DLT Library includes */
 #include "dlt_client.h"
diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c
index 505c056..0a4c101 100644
--- a/src/tests/dlt-test-stress-client.c
+++ b/src/tests/dlt-test-stress-client.c
@@ -67,8 +67,6 @@
 
 #include <ctype.h>      /* for isprint() */
 #include <stdlib.h>     /* for atoi() */
-#include <sys/stat.h>   /* for S_IRUSR, S_IWUSR, S_IRGRP, S_IROTH */
-#include <fcntl.h>      /* for open() */
 #include <string.h>     /* for strcmp() */
 #include <sys/uio.h>    /* for writev() */
 
-- 
cgit v1.2.1