diff options
| -rw-r--r-- | compat.h | 29 |
1 files changed, 22 insertions, 7 deletions
@@ -61,12 +61,31 @@ void warn(const char *, ...); void warnx(const char *, ...); #endif -#ifndef HAVE_PATHS_H -#define _PATH_BSHELL "/bin/sh" -#define _PATH_TMP "/tmp/" +#ifdef HAVE_PATHS_H +#include <paths.h> +#endif + +#ifndef _PATH_BSHELL +#define _PATH_BSHELL "/bin/sh" +#endif + +#ifndef _PATH_TMP +#define _PATH_TMP "/tmp/" +#endif + +#ifndef _PATH_DEVNULL #define _PATH_DEVNULL "/dev/null" +#endif + +#ifndef _PATH_TTY #define _PATH_TTY "/dev/tty" +#endif + +#ifndef _PATH_DEV #define _PATH_DEV "/dev/" +#endif + +#ifndef _PATH_DEFPATH #define _PATH_DEFPATH "/usr/bin:/bin" #endif @@ -98,10 +117,6 @@ void warnx(const char *, ...); #include "compat/bitstring.h" #endif -#ifdef HAVE_PATHS_H -#include <paths.h> -#endif - #ifdef HAVE_LIBUTIL_H #include <libutil.h> #endif |