From: Lionel Sambuc <lionel@minix3.org>
Date: Mon, 2 Dec 2013 17:34:30 +0000 (+0100)
Subject: include/paths.h: merged
X-Git-Tag: v3.3.0~478
X-Git-Url: http://zhaoyanbai.com/repos/%22../static/icons/zlib_tech.html?a=commitdiff_plain;h=afc1f7118868c3aa06b2a5e0edb9da1dc0ae673e;p=minix.git

include/paths.h: merged

Change-Id: I5e2aa0bc99a596f82ef4224f22623bcb83cb98b5
---

diff --git a/commands/dhcpd/dhcpd.h b/commands/dhcpd/dhcpd.h
index 93bf5a899..4ec65b19f 100644
--- a/commands/dhcpd/dhcpd.h
+++ b/commands/dhcpd/dhcpd.h
@@ -5,7 +5,7 @@
 
 #define nil ((void*)0)
 
-#include <paths.h>
+#include <minix/paths.h>
 
 /* Paths to files. */
 #define PATH_DHCPCONF	_PATH_DHCPCONF
diff --git a/commands/hostaddr/hostaddr.c b/commands/hostaddr/hostaddr.c
index ddaf5d301..18cc506bd 100644
--- a/commands/hostaddr/hostaddr.c
+++ b/commands/hostaddr/hostaddr.c
@@ -32,7 +32,7 @@ Created:	Jan 27, 1992 by Philip Homburg
 #include <net/gen/resolv.h>
 #include <net/gen/dhcp.h>
 
-#include <paths.h>
+#include <minix/paths.h>
 
 char *prog_name;
 
diff --git a/commands/nonamed/nonamed.c b/commands/nonamed/nonamed.c
index 5760238c6..34362da61 100644
--- a/commands/nonamed/nonamed.c
+++ b/commands/nonamed/nonamed.c
@@ -44,6 +44,7 @@ static const char version[] = "2.7";
 #include <net/gen/dhcp.h>
 
 #include <paths.h>
+#include <minix/paths.h>
 
 #undef HTONL
 #undef HTONS
diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index f5dbde8a9..98e32b89f 100644
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -41,7 +41,7 @@
 
 #include <minix/config.h>
 #include <minix/endpoint.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <minix/procfs.h>
 #include <limits.h>
 #include <sys/types.h>
diff --git a/commands/ramdisk/ramdisk.c b/commands/ramdisk/ramdisk.c
index 9fe0bb5a6..139baf2bc 100644
--- a/commands/ramdisk/ramdisk.c
+++ b/commands/ramdisk/ramdisk.c
@@ -1,5 +1,5 @@
 
-#include <paths.h>
+#include <minix/paths.h>
 
 #include <sys/ioc_memory.h>
 #include <stdio.h>
diff --git a/commands/service/parse.c b/commands/service/parse.c
index 08ccd3fe1..fe2433687 100644
--- a/commands/service/parse.c
+++ b/commands/service/parse.c
@@ -18,7 +18,7 @@
 #include <minix/rs.h>
 #include <minix/syslib.h>
 #include <minix/bitmap.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <minix/sef.h>
 #include <minix/dmap.h>
 #include <sys/types.h>
diff --git a/commands/service/service.c b/commands/service/service.c
index cdfc86cda..e8c965a0b 100644
--- a/commands/service/service.c
+++ b/commands/service/service.c
@@ -24,7 +24,7 @@
 #include <minix/rs.h>
 #include <minix/syslib.h>
 #include <minix/bitmap.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <minix/sef.h>
 #include <minix/dmap.h>
 #include <sys/types.h>
diff --git a/include/minix/paths.h b/include/minix/paths.h
index 447c465af..195d80f62 100644
--- a/include/minix/paths.h
+++ b/include/minix/paths.h
@@ -13,8 +13,6 @@
 #define _PATH_DHCPCACHE	"/usr/adm/dhcp.cache"
 #define _PATH_DHCPPOOL	"/usr/adm/dhcp.pool"
 
-#define _PATH_MOTD	"/etc/motd"
-
 #define _PATH_RAMDISK	"/dev/ram"
 
 #define _PATH_DRIVERS	"/usr/sbin"
diff --git a/include/paths.h b/include/paths.h
index 2cf6711e6..82f2ae532 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -126,9 +126,5 @@
 #define	_PATH_VI	"/usr/bin/vi"
 #endif
 
-#ifdef __minix
-#include <minix/paths.h>
-#endif /* !__minix */
-
 #endif /* !_PATHS_H_ */
 
diff --git a/lib/libc/gen/minix/getloadavg.c b/lib/libc/gen/minix/getloadavg.c
index 33c2c46db..af2cf5cac 100644
--- a/lib/libc/gen/minix/getloadavg.c
+++ b/lib/libc/gen/minix/getloadavg.c
@@ -2,7 +2,7 @@
 #include "namespace.h"
 
 #include <sys/types.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/minix/sysconf.c b/lib/libc/gen/minix/sysconf.c
index 3a1e6fd24..a740b3b7a 100644
--- a/lib/libc/gen/minix/sysconf.c
+++ b/lib/libc/gen/minix/sysconf.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
-#include <paths.h>
+#include <minix/paths.h>
 
 #ifdef __weak_alias
 __weak_alias(sysconf, __sysconf)
diff --git a/lib/libc/sys-minix/mount.c b/lib/libc/sys-minix/mount.c
index 1224e2717..c5f2006c7 100644
--- a/lib/libc/sys-minix/mount.c
+++ b/lib/libc/sys-minix/mount.c
@@ -7,9 +7,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/stat.h>
-#include <minix/syslib.h>
+#include <minix/paths.h>
 #include <minix/rs.h>
-#include <paths.h>
+#include <minix/syslib.h>
 #include <unistd.h>
 #define OK	0
 
diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c
index 14fda34fe..a83a3cc3a 100644
--- a/usr.bin/top/top.c
+++ b/usr.bin/top/top.c
@@ -31,7 +31,7 @@
 #include <minix/endpoint.h>
 #include <minix/const.h>
 #include <minix/u64.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <minix/procfs.h>
 
 #define TIMECYCLEKEY 't'
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index e95f6d2a4..0afc56db7 100644
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -76,6 +76,7 @@
 #include <sys/disk.h>
 #include <sys/bitops.h>
 #else
+#include <minix/paths.h>
 #include <sys/wait.h>
 #endif