.

diff --git a/src/system.h b/src/system.h
index 5e76360184f58081d4b70030525ed9c52e8a4623..7c49788d1252eb3c410b645219b2f9b365b58591 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -19,38 +19,18 @@
 
 #include <sys/stat.h>
 
-#ifdef STAT_MACROS_BROKEN
-#ifdef S_ISBLK
+#ifdef STAT_MACROS_BROKEN
 #undef S_ISBLK
-#endif
-#ifdef S_ISCHR
 #undef S_ISCHR
-#endif
-#ifdef S_ISDIR
 #undef S_ISDIR
-#endif
-#ifdef S_ISFIFO
 #undef S_ISFIFO
-#endif
-#ifdef S_ISLNK
 #undef S_ISLNK
-#endif
-#ifdef S_ISMPB
 #undef S_ISMPB
-#endif
-#ifdef S_ISMPC
 #undef S_ISMPC
-#endif
-#ifdef S_ISNWK
 #undef S_ISNWK
-#endif
-#ifdef S_ISREG
 #undef S_ISREG
-#endif
-#ifdef S_ISSOCK
 #undef S_ISSOCK
-#endif
-#endif /* STAT_MACROS_BROKEN.  */
+#endif /* STAT_MACROS_BROKEN.  */
 
 #ifndef S_ISREG                        /* Doesn't have POSIX.1 stat stuff. */
 #define mode_t unsigned short
@@ -97,6 +77,18 @@
 #include <unistd.h>
 #endif
 
+#ifndef STDIN_FILENO
+#define STDIN_FILENO 0
+#endif
+
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO 1
+#endif
+
+#ifndef STDERR_FILENO
+#define STDERR_FILENO 2
+#endif
+
 #include "pathmax.h"
 
 #ifndef _POSIX_VERSION
@@ -252,8 +244,14 @@ extern int errno;
    otherwise return it unchanged. */
 #define convert_blocks(b, k) ((k) ? ((b) + 1) / 2 : (b))
 
+#include "safe-stat.h"
+#include "safe-lstat.h"
+
 #ifndef S_ISLNK
 #define lstat stat
+#undef SAFE_LSTAT
+#define SAFE_LSTAT SAFE_STAT
+#define safe_lstat safe_stat
 #endif
 
 #ifndef RETSIGTYPE