include/paths.h: merged

Change-Id: I5e2aa0bc99a596f82ef4224f22623bcb83cb98b5
This commit is contained in:
Lionel Sambuc 2013-12-02 18:34:30 +01:00
parent a6e7b85835
commit afc1f71188
14 changed files with 13 additions and 17 deletions

View file

@ -5,7 +5,7 @@
#define nil ((void*)0) #define nil ((void*)0)
#include <paths.h> #include <minix/paths.h>
/* Paths to files. */ /* Paths to files. */
#define PATH_DHCPCONF _PATH_DHCPCONF #define PATH_DHCPCONF _PATH_DHCPCONF

View file

@ -32,7 +32,7 @@ Created: Jan 27, 1992 by Philip Homburg
#include <net/gen/resolv.h> #include <net/gen/resolv.h>
#include <net/gen/dhcp.h> #include <net/gen/dhcp.h>
#include <paths.h> #include <minix/paths.h>
char *prog_name; char *prog_name;

View file

@ -44,6 +44,7 @@ static const char version[] = "2.7";
#include <net/gen/dhcp.h> #include <net/gen/dhcp.h>
#include <paths.h> #include <paths.h>
#include <minix/paths.h>
#undef HTONL #undef HTONL
#undef HTONS #undef HTONS

View file

@ -41,7 +41,7 @@
#include <minix/config.h> #include <minix/config.h>
#include <minix/endpoint.h> #include <minix/endpoint.h>
#include <paths.h> #include <minix/paths.h>
#include <minix/procfs.h> #include <minix/procfs.h>
#include <limits.h> #include <limits.h>
#include <sys/types.h> #include <sys/types.h>

View file

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

View file

@ -18,7 +18,7 @@
#include <minix/rs.h> #include <minix/rs.h>
#include <minix/syslib.h> #include <minix/syslib.h>
#include <minix/bitmap.h> #include <minix/bitmap.h>
#include <paths.h> #include <minix/paths.h>
#include <minix/sef.h> #include <minix/sef.h>
#include <minix/dmap.h> #include <minix/dmap.h>
#include <sys/types.h> #include <sys/types.h>

View file

@ -24,7 +24,7 @@
#include <minix/rs.h> #include <minix/rs.h>
#include <minix/syslib.h> #include <minix/syslib.h>
#include <minix/bitmap.h> #include <minix/bitmap.h>
#include <paths.h> #include <minix/paths.h>
#include <minix/sef.h> #include <minix/sef.h>
#include <minix/dmap.h> #include <minix/dmap.h>
#include <sys/types.h> #include <sys/types.h>

View file

@ -13,8 +13,6 @@
#define _PATH_DHCPCACHE "/usr/adm/dhcp.cache" #define _PATH_DHCPCACHE "/usr/adm/dhcp.cache"
#define _PATH_DHCPPOOL "/usr/adm/dhcp.pool" #define _PATH_DHCPPOOL "/usr/adm/dhcp.pool"
#define _PATH_MOTD "/etc/motd"
#define _PATH_RAMDISK "/dev/ram" #define _PATH_RAMDISK "/dev/ram"
#define _PATH_DRIVERS "/usr/sbin" #define _PATH_DRIVERS "/usr/sbin"

View file

@ -126,9 +126,5 @@
#define _PATH_VI "/usr/bin/vi" #define _PATH_VI "/usr/bin/vi"
#endif #endif
#ifdef __minix
#include <minix/paths.h>
#endif /* !__minix */
#endif /* !_PATHS_H_ */ #endif /* !_PATHS_H_ */

View file

@ -2,7 +2,7 @@
#include "namespace.h" #include "namespace.h"
#include <sys/types.h> #include <sys/types.h>
#include <paths.h> #include <minix/paths.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>

View file

@ -13,7 +13,7 @@
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#include <paths.h> #include <minix/paths.h>
#ifdef __weak_alias #ifdef __weak_alias
__weak_alias(sysconf, __sysconf) __weak_alias(sysconf, __sysconf)

View file

@ -7,9 +7,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <minix/syslib.h> #include <minix/paths.h>
#include <minix/rs.h> #include <minix/rs.h>
#include <paths.h> #include <minix/syslib.h>
#include <unistd.h> #include <unistd.h>
#define OK 0 #define OK 0

View file

@ -31,7 +31,7 @@
#include <minix/endpoint.h> #include <minix/endpoint.h>
#include <minix/const.h> #include <minix/const.h>
#include <minix/u64.h> #include <minix/u64.h>
#include <paths.h> #include <minix/paths.h>
#include <minix/procfs.h> #include <minix/procfs.h>
#define TIMECYCLEKEY 't' #define TIMECYCLEKEY 't'

View file

@ -76,6 +76,7 @@
#include <sys/disk.h> #include <sys/disk.h>
#include <sys/bitops.h> #include <sys/bitops.h>
#else #else
#include <minix/paths.h>
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif