include/netdb.h: merged

Change-Id: I899e6ac611b671a78d6abd83a73eed484aa49595

diff --git a/commands/tcpd/tcpd.c b/commands/tcpd/tcpd.c
index 01fa3a194b072f392753b8deab413e6ec023a1fd..419a77781108bbac41352db62592bcaeb99eba5d 100644 (file)
--- 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 2f86d43921ab58d3ee7b06a40a21763611cb153a..b7ed98276721a4c39d0a9bb8adb7591e06d08a3d 100644 (file)
--- 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 195d80f62aec4218c981aeecd84890842f455995..132f84da11c3b7118537a8f1a8dd66784bd5bd2b 100644 (file)
--- 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 c699312874f6e3dd6f3a7624d435d679fb631f26..42ade05be798c002df125eec48d2be0ee2e7c30d 100644 (file)
--- 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 330dbc1cadae6684138c161a24f473bc0d2fb586..3010878edcb60399f52e3ed4fee0359db70627bd 100644 (file)
--- 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>