mc/mc.umode_t.patch

---
 acinclude.m4  |   10 ------
 config.h.in   |    2 -
 configure     |   85 ----------------------------------------------------------
 configure.ac  |    1 
 src/achown.c  |    1 
 src/chmod.c   |    1 
 src/file.c    |    1 
 vfs/undelfs.c |    6 ----
 8 files changed, 3 insertions(+), 104 deletions(-)

--- a/acinclude.m4
+++ b/acinclude.m4
@@ -12,12 +12,7 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [
     AC_CHECK_HEADERS([ext2fs/ext2fs.h], [ext2fs_ext2fs_h=yes], ,
 		     [
 #include <stdio.h>
-#ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
-#else
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
 		     ])
     if test x$ext2fs_ext2fs_h = xyes; then
       AC_DEFINE(USE_EXT2FSLIB, 1,
@@ -32,12 +27,7 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
-#else
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
 #include <ext2fs/ext2fs.h>
 		    ])
     fi
--- a/config.h.in
+++ b/config.h.in
@@ -689,5 +689,3 @@
    <stdint.h> don't define. */
 #undef uintmax_t
 
-/* Define to `int' if <sys/types.h> does not define. */
-#undef umode_t
--- a/configure
+++ b/configure
@@ -13667,71 +13667,6 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for umode_t" >&5
-echo $ECHO_N "checking for umode_t... $ECHO_C" >&6
-if test "${ac_cv_type_umode_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((umode_t *) 0)
-  return 0;
-if (sizeof (umode_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_umode_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_umode_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_umode_t" >&5
-echo "${ECHO_T}$ac_cv_type_umode_t" >&6
-if test $ac_cv_type_umode_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define umode_t int
-_ACEOF
-
-fi
 
 echo "$as_me:$LINENO: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
@@ -18590,12 +18525,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <stdio.h>
-#ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
-#else
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
 
 
 #include <$ac_header>
@@ -18666,12 +18596,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
-#else
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
 #include <ext2fs/ext2fs.h>
 
 
@@ -18984,12 +18909,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <stdio.h>
-#ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
-#else
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
 
 
 #include <$ac_header>
@@ -19060,12 +18980,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
-#else
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
 #include <ext2fs/ext2fs.h>
 
 
--- a/configure.ac
+++ b/configure.ac
@@ -210,7 +210,6 @@ dnl Missing typedefs and replacements
 dnl 
 
 AC_TYPE_MODE_T
-AC_CHECK_TYPE(umode_t, int)
 AC_CHECK_TYPE(off_t, long)
 AC_TYPE_PID_T
 AC_TYPE_UID_T
--- a/src/achown.c
+++ b/src/achown.c
@@ -19,6 +19,7 @@
 #include <config.h>
 /* Needed for the extern declarations of integer parameters */
 #include <sys/types.h>
+#include <linux/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -22,6 +22,7 @@
 #include <errno.h>	/* For errno on SunOS systems	      */
 /* Needed for the extern declarations of integer parameters */
 #include <sys/types.h>
+#include <linux/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
--- a/src/file.c
+++ b/src/file.c
@@ -43,6 +43,7 @@
 #define WITH_FULL_PATHS 1
 
 #include <sys/types.h>
+#include <linux/types.h>
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
--- a/vfs/undelfs.c
+++ b/vfs/undelfs.c
@@ -39,13 +39,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
-#else
-/* asm/types.h defines its own umode_t */
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
 
 #include <ext2fs/ext2fs.h>
 #include <ctype.h>