2003-06-27 Roland McGrath <roland@redhat.com>

	* configure.ac: Check for type `struct __old_kernel_stat'.
	* file.c (convertoldstat, printoldstat): Define under
	[LINUX && HAVE_STRUCT___OLD_KERNEL_STAT] rather than a list of archs.
	(sys_oldstat, sys_oldfstat, sys_oldlstat): Likewise.
	* linux/dummy.h [! HAVE_STRUCT___OLD_KERNEL_STAT]
	(sys_oldstat, sys_oldfstat, sys_oldlstat): #define to printargs.

diff --git a/configure.ac b/configure.ac
index ac2034423e6abfca04680ae08d65ffbf8c75237f..98185d55ead1681bd1f600add678af5661c13f23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -205,6 +205,8 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
 [#include <sys/stream.h>
 #include <sys/tihdr.h>])
 
+AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
+
 AC_CHECK_DECLS([sys_errlist])
 AC_CHECK_DECLS([sys_siglist, _sys_siglist],,, [#include <signal.h>])
 

diff --git a/file.c b/file.c
index 1706c6a29f78674ec9477a15285eb5e517f065fd..fe2bbbc752f7fcd809983a83f9b7b43c81cb3a24 100644 (file)
--- a/file.c
+++ b/file.c
@@ -919,8 +919,7 @@ long addr;
 }
 #endif /* HAVE_STAT64 */
 
-#if defined(LINUX) && !defined(IA64) && !defined(HPPA) && !defined(X86_64) \
-    && !defined(S390) && !defined(S390X)
+#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 static void
 convertoldstat(oldbuf, newbuf)
 const struct __old_kernel_stat *oldbuf;
@@ -1007,9 +1006,7 @@ struct tcb *tcp;
 #endif
 }
 
-#ifdef LINUX
-# if !defined(IA64) && !defined(HPPA) && !defined(X86_64) \
-     && !defined(S390) && !defined(S390X)
+#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 int
 sys_oldstat(tcp)
 struct tcb *tcp;
@@ -1022,8 +1019,7 @@ struct tcb *tcp;
        }
        return 0;
 }
-# endif /* !IA64 && !HPPA*/
-#endif /* LINUX */
+#endif /* LINUX && HAVE_STRUCT___OLD_KERNEL_STAT */
 
 #ifndef HAVE_LONG_LONG_OFF_T
 int
@@ -1055,9 +1051,7 @@ struct tcb *tcp;
 #endif
 }
 
-#ifdef LINUX
-# if !defined(IA64) && !defined(HPPA) && !defined(X86_64) \
-     && !defined(S390) && !defined(S390X)
+#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 int
 sys_oldfstat(tcp)
 struct tcb *tcp;
@@ -1069,8 +1063,7 @@ struct tcb *tcp;
        }
        return 0;
 }
-# endif /* !IA64 && !HPPA && !X86_64 && !S390 && !S390X */
-#endif
+#endif /* LINUX && HAVE_STRUCT___OLD_KERNEL_STAT */
 
 #ifndef HAVE_LONG_LONG_OFF_T
 int
@@ -1104,9 +1097,7 @@ struct tcb *tcp;
 #endif
 }
 
-#ifdef LINUX
-# if !defined(IA64) && !defined(HPPA) && !defined(X86_64) \
-     && !defined(S390) && !defined(S390X)
+#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 int
 sys_oldlstat(tcp)
 struct tcb *tcp;
@@ -1119,8 +1110,7 @@ struct tcb *tcp;
        }
        return 0;
 }
-# endif /* !IA64 && !HPPA && !X86_64 && !S390 && !S390X */
-#endif
+#endif /* LINUX && HAVE_STRUCT___OLD_KERNEL_STAT */
 
 
 #if defined(SVR4) || defined(LINUXSPARC)

diff --git a/linux/dummy.h b/linux/dummy.h
index ba331627598c15125706d5e2be2ce7a1122e9522..2cccdead2e246326e77485b4f41529a1dee4e6be 100644 (file)
--- a/linux/dummy.h
+++ b/linux/dummy.h
@@ -123,6 +123,12 @@
 #define sys_putpmsg            printargs
 #endif
 
+#ifndef HAVE_STRUCT___OLD_KERNEL_STAT
+#define sys_oldstat            printargs
+#define sys_oldfstat           printargs
+#define sys_oldlstat           printargs
+#endif
+
 #if DONE
 #define sys_oldselect          printargs
 #define        sys_msync               printargs