From 479fea75f0994ee16830987c951cfda588d15dc1 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Mon, 2 Dec 2013 18:17:49 +0100
Subject: [PATCH] include/netdb.h: merged

Change-Id: I899e6ac611b671a78d6abd83a73eed484aa49595
---
 commands/tcpd/tcpd.c       | 1 +
 commands/tcpdp/tcpd.c      | 1 +
 include/minix/paths.h      | 2 ++
 include/netdb.h            | 3 ---
 lib/libminlib/servxcheck.c | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/commands/tcpd/tcpd.c b/commands/tcpd/tcpd.c
index 01fa3a194..419a77781 100644
--- a/commands/tcpd/tcpd.c
+++ b/commands/tcpd/tcpd.c
@@ -12,6 +12,7 @@ tcpd.c
 #include <unistd.h>
 #include <signal.h>
 #include <minix/config.h>
+#include <minix/paths.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <net/hton.h>
diff --git a/commands/tcpdp/tcpd.c b/commands/tcpdp/tcpd.c
index 2f86d4392..b7ed98276 100644
--- a/commands/tcpdp/tcpd.c
+++ b/commands/tcpdp/tcpd.c
@@ -12,6 +12,7 @@ tcpd.c
 #include <unistd.h>
 #include <signal.h>
 #include <minix/config.h>
+#include <minix/paths.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <net/hton.h>
diff --git a/include/minix/paths.h b/include/minix/paths.h
index 195d80f62..132f84da1 100644
--- a/include/minix/paths.h
+++ b/include/minix/paths.h
@@ -17,4 +17,6 @@
 
 #define _PATH_DRIVERS	"/usr/sbin"
 
+#define	_PATH_SERVACCES	"/etc/serv.access"
+
 #endif /* _MINIX_PATHS_H_ */
diff --git a/include/netdb.h b/include/netdb.h
index c69931287..42ade05be 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -131,9 +131,6 @@ typedef _BSD_SIZE_T_	size_t;
 #ifndef _PATH_SERVICES_DB
 #define	_PATH_SERVICES_DB "/var/db/services.db"
 #endif
-#ifdef __minix
-#define	_PATH_SERVACCES	"/etc/serv.access"
-#endif
 #endif
 
 __BEGIN_DECLS
diff --git a/lib/libminlib/servxcheck.c b/lib/libminlib/servxcheck.c
index 330dbc1ca..3010878ed 100644
--- a/lib/libminlib/servxcheck.c
+++ b/lib/libminlib/servxcheck.c
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <sys/ioctl.h>
+#include <minix/paths.h>
 #include <net/hton.h>
 #include <net/gen/in.h>
 #include <net/gen/tcp.h>
-- 
2.44.0