From 7fb393c66df33110fef0cbabac7d304f12eb82e4 Mon Sep 17 00:00:00 2001
|
From: Khem Raj <raj.khem@gmail.com>
|
Date: Fri, 15 Sep 2017 09:39:40 -0700
|
Subject: [PATCH] src: Add missing header limits.h for _POSIX_HOST_NAME_MAX
|
|
Use _GNU_SOURCE instead of libc internal __USE_GNU
|
Do not use the deprecated headers under include/sys
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
src/base/os_defs.h | 5 +++--
|
src/mds/mds_dt_tcp.c | 1 -
|
src/mds/mds_dt_tcp_disc.h | 2 +-
|
src/mds/mds_dt_tipc.c | 1 -
|
src/mds/mds_dt_tipc.h | 2 +-
|
src/mds/mds_dt_trans.c | 1 -
|
src/ntf/ntfd/NtfLogger.cc | 2 +-
|
7 files changed, 6 insertions(+), 8 deletions(-)
|
|
diff --git a/src/base/os_defs.h b/src/base/os_defs.h
|
index a570c43..3559b19 100644
|
--- a/src/base/os_defs.h
|
+++ b/src/base/os_defs.h
|
@@ -47,17 +47,18 @@
|
#include <sys/stat.h>
|
#include <sys/msg.h> /* Added for message-queues : PM : 28/10/03 */
|
#include <syslog.h>
|
-#ifndef __USE_GNU
|
+#include <limits.h>
|
+#ifndef _GNU_SOURCE
|
struct msgbuf {
|
long int mtype;
|
char mtext[1];
|
};
|
#endif /* else defined in <sys/msg.h> */
|
#include <sys/time.h>
|
-#include <sys/fcntl.h>
|
#include <sys/socket.h>
|
#include <netinet/in.h>
|
|
+#include <fcntl.h>
|
#include <signal.h>
|
#include <pthread.h>
|
|
diff --git a/src/mds/mds_dt_tcp.c b/src/mds/mds_dt_tcp.c
|
index 1407eb1..a87c22f 100644
|
--- a/src/mds/mds_dt_tcp.c
|
+++ b/src/mds/mds_dt_tcp.c
|
@@ -27,7 +27,6 @@
|
|
#include <stdlib.h>
|
#include <sched.h>
|
-#include <sys/poll.h>
|
#include <poll.h>
|
#include <sys/types.h>
|
#include <unistd.h>
|
diff --git a/src/mds/mds_dt_tcp_disc.h b/src/mds/mds_dt_tcp_disc.h
|
index a6249d7..574f526 100644
|
--- a/src/mds/mds_dt_tcp_disc.h
|
+++ b/src/mds/mds_dt_tcp_disc.h
|
@@ -24,7 +24,7 @@
|
#include "base/ncssysf_tsk.h"
|
#include "base/ncssysf_mem.h"
|
#include "mds_dt_tcp_disc.h"
|
-#include "sys/poll.h"
|
+#include <poll.h>
|
|
/* mds_indentifire + mds_version + msg_type + scope_type + server_type +
|
server_instance_lower + server_instance_upper + sub_ref_val + sub_ref_val +
|
diff --git a/src/mds/mds_dt_tipc.c b/src/mds/mds_dt_tipc.c
|
index 7714175..a0ed3b6 100644
|
--- a/src/mds/mds_dt_tipc.c
|
+++ b/src/mds/mds_dt_tipc.c
|
@@ -35,7 +35,6 @@
|
#include <stdbool.h>
|
#include <stdlib.h>
|
#include <sched.h>
|
-#include <sys/poll.h>
|
#include <poll.h>
|
#include <sys/types.h>
|
#include <unistd.h>
|
diff --git a/src/mds/mds_dt_tipc.h b/src/mds/mds_dt_tipc.h
|
index e73a11b..401d208 100644
|
--- a/src/mds/mds_dt_tipc.h
|
+++ b/src/mds/mds_dt_tipc.h
|
@@ -32,7 +32,7 @@
|
#include <assert.h>
|
#include <string.h>
|
#include <sys/param.h>
|
-#include <sys/poll.h>
|
+#include <poll.h>
|
#include <netdb.h>
|
#include <errno.h>
|
#include <fcntl.h>
|
diff --git a/src/mds/mds_dt_trans.c b/src/mds/mds_dt_trans.c
|
index 6f621e0..5aacbd3 100644
|
--- a/src/mds/mds_dt_trans.c
|
+++ b/src/mds/mds_dt_trans.c
|
@@ -26,7 +26,6 @@
|
#include "mds_core.h"
|
#include "base/osaf_utility.h"
|
|
-#include <sys/poll.h>
|
#include <poll.h>
|
|
#define MDS_PROT_TCP 0xA0
|
diff --git a/src/ntf/ntfd/NtfLogger.cc b/src/ntf/ntfd/NtfLogger.cc
|
index fd17c58..1120008 100644
|
--- a/src/ntf/ntfd/NtfLogger.cc
|
+++ b/src/ntf/ntfd/NtfLogger.cc
|
@@ -20,7 +20,7 @@
|
* INCLUDE FILES
|
* ========================================================================
|
*/
|
-#include <sys/poll.h>
|
+#include <poll.h>
|
|
#include "base/osaf_utility.h"
|
#include <saAis.h>
|
