commit 10a88d09ebe283d0dd2ba5deccfe50dc20ea5821
author Michal Ludvig <mludvig@suse.cz> Mon Oct 07 14:31:00 2002 +0000
committer Michal Ludvig <mludvig@suse.cz> Mon Oct 07 14:31:00 2002 +0000
tree 0e9f1973496ec2e922d3f65b20164bc0386163e6
parent c57fb8e410952223a72d474be8414ebfc63cc025

2002-10-07  Michal Ludvig  <mludvig@suse.cz>

        Merged s390x port by Heiko Carstens <Heiko.Carstens@de.ibm.com>
        and bugfixes to s390 by D.J. Barrow.

file.c

diff --git a/file.c b/file.c
index 1ae9fe5..5b30eba 100644
--- a/file.c
+++ b/file.c
@@ -40,6 +40,7 @@
 #include <linux/types.h>
 #include <linux/dirent.h>
 #undef dirent
+#undef dirent64
 #else
 #define kernel_dirent dirent
 #endif
@@ -889,7 +890,8 @@
 }
 #endif /* HAVE_STAT64 */
 
-#if defined(LINUX) && !defined(IA64) && !defined(HPPA) && !defined(X86_64)
+#if defined(LINUX) && !defined(IA64) && !defined(HPPA) && !defined(X86_64) \
+    && !defined(S390) && !defined(S390X)
 static void
 convertoldstat(oldbuf, newbuf)
 const struct __old_kernel_stat *oldbuf;
@@ -942,7 +944,7 @@
 	convertoldstat(&statbuf, &newstatbuf);
 	realprintstat(tcp, &newstatbuf);
 }
-#endif /* LINUX && !IA64 */
+#endif /* LINUX && !IA64 && !HPPA && !X86_64 && !S390 && !S390X */
 
 #ifndef HAVE_LONG_LONG_OFF_T
 int
@@ -977,7 +979,8 @@
 }
 
 #ifdef LINUX
-# if !defined(IA64) && !defined(HPPA) && !defined(X86_64)
+# if !defined(IA64) && !defined(HPPA) && !defined(X86_64) \
+     && !defined(S390) && !defined(S390X)
 int
 sys_oldstat(tcp)
 struct tcb *tcp;
@@ -1024,7 +1027,8 @@
 }
 
 #ifdef LINUX
-# if !defined(IA64) && !defined(HPPA) && !defined(X86_64)
+# if !defined(IA64) && !defined(HPPA) && !defined(X86_64) \
+     && !defined(S390) && !defined(S390X)
 int
 sys_oldfstat(tcp)
 struct tcb *tcp;
@@ -1036,7 +1040,7 @@
 	}
 	return 0;
 }
-# endif /* !IA64 && !HPPA*/
+# endif /* !IA64 && !HPPA && !X86_64 && !S390 && !S390X */
 #endif
 
 #ifndef HAVE_LONG_LONG_OFF_T
@@ -1072,7 +1076,8 @@
 }
 
 #ifdef LINUX
-# if !defined(IA64) && !defined(HPPA) && !defined(X86_64)
+# if !defined(IA64) && !defined(HPPA) && !defined(X86_64) \
+     && !defined(S390) && !defined(S390X)
 int
 sys_oldlstat(tcp)
 struct tcb *tcp;
@@ -1085,7 +1090,7 @@
 	}
 	return 0;
 }
-# endif /* !IA64 && !HPPA */
+# endif /* !IA64 && !HPPA && !X86_64 && !S390 && !S390X */
 #endif