Fixed several wrong or missing checks for the presence of sys/file.h - if these

bugs are still in bash 3.0, we should send them a patch for this...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17970 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/bin/bash/builtins/fc.def

@@ -49,12 +49,12 @@ $END
 #include <config.h>
 
 #if defined (HISTORY)
-#ifndef _MINIX
+#if defined (HAVE_SYS_PARAM_H)
 #  include <sys/param.h>
 #endif
 #include "../bashtypes.h"
 #include "posixstat.h"
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 

src/bin/bash/builtins/history.def

@@ -47,7 +47,7 @@ $END
 
 #if defined (HISTORY)
 #include "../bashtypes.h"
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 #include "posixstat.h"

src/bin/bash/builtins/source.def

@@ -41,7 +41,7 @@ $END
 #include "../bashtypes.h"
 #include "posixstat.h"
 #include "filecntl.h"
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H) 
 #  include <sys/file.h>
 #endif
 #include <errno.h>

src/bin/bash/builtins/umask.def

@@ -37,7 +37,7 @@ $END
 
 #include "../bashtypes.h"
 #include "filecntl.h"
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 

src/bin/bash/execute_cmd.c

@@ -26,13 +26,13 @@
 #include <stdio.h>
 #include "chartypes.h"
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"
 #include "posixstat.h"
 #include <signal.h>
-#ifndef _MINIX
+#ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
 #endif
 

src/bin/bash/findcmd.c

@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include "chartypes.h"
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"

src/bin/bash/input.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"

src/bin/bash/jobs.c

@@ -39,7 +39,9 @@
 #  include <sys/resource.h>
 #endif /* !_POSIX_VERSION && HAVE_SYS_RESOURCE_H && HAVE_WAIT3 && !RLIMTYPE */
 
-#include <sys/file.h>
+#ifdef HAVE_SYS_FILE_H
+#  include <sys/file.h>
+#endif
 #include "filecntl.h"
 #include <sys/ioctl.h>
 #include <sys/param.h>

src/bin/bash/lib/readline/histfile.c

@@ -32,7 +32,7 @@
 #include <stdio.h>
 
 #include <sys/types.h>
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 #include "posixstat.h"

src/bin/bash/lib/sh/netconn.c

@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <bashtypes.h>
-#ifndef _MINIX
+#if defined (SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 #include <posixstat.h>

src/bin/bash/make_cmd.c

@@ -23,7 +23,7 @@ Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
 #include <stdio.h>
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"

src/bin/bash/redir.c

@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"

src/bin/bash/shell.c

@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "posixstat.h"

src/bin/bash/test.c

@@ -45,9 +45,9 @@
 extern int errno;
 #endif /* !errno */
 
-#if !defined (_POSIX_VERSION)
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
-#endif /* !_POSIX_VERSION */
+#endif
 #include "posixstat.h"
 #include "filecntl.h"