include/paths.h: merged

Change-Id: I5e2aa0bc99a596f82ef4224f22623bcb83cb98b5

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

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;
 

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

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>

commands/ramdisk/ramdisk.c

@@ -1,5 +1,5 @@
 
-#include <paths.h>
+#include <minix/paths.h>
 
 #include <sys/ioc_memory.h>
 #include <stdio.h>

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>

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>

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"

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_ */
 

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>

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)

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
 

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'

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