From 62653059d61eae9c559b514bb126df9e2e845273 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 14 Nov 2001 11:09:46 +0000
Subject: Scrub up some lingering problems preventing readdir64 from working
 and creating several *64 problems, particualrly when client apps used
 -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64.  All better now.  -Erik

---
 libc/sysdeps/linux/arm/bits/dirent.h     | 6 ++++--
 libc/sysdeps/linux/i386/bits/dirent.h    | 6 ++++--
 libc/sysdeps/linux/m68k/bits/dirent.h    | 6 ++++--
 libc/sysdeps/linux/mips/bits/dirent.h    | 6 ++++--
 libc/sysdeps/linux/powerpc/bits/dirent.h | 6 ++++--
 libc/sysdeps/linux/sh/bits/dirent.h      | 3 +++
 libc/sysdeps/linux/sparc/bits/dirent.h   | 6 ++++--
 libc/sysdeps/linux/v850/bits/dirent.h    | 3 +++
 8 files changed, 30 insertions(+), 12 deletions(-)

(limited to 'libc/sysdeps')

diff --git a/libc/sysdeps/linux/arm/bits/dirent.h b/libc/sysdeps/linux/arm/bits/dirent.h
index 01fbf54dd..7e3769a48 100644
--- a/libc/sysdeps/linux/arm/bits/dirent.h
+++ b/libc/sysdeps/linux/arm/bits/dirent.h
@@ -30,7 +30,9 @@ struct dirent
     __off64_t d_off;
 #endif
     unsigned short int d_reclen;
-    //unsigned char d_type;
+#ifdef __USE_FILE_OFFSET64
+    unsigned char d_type;
+#endif
     char d_name[256];		/* We must not include limits.h! */
   };
 
@@ -40,7 +42,7 @@ struct dirent64
     __ino64_t d_ino;
     __off64_t d_off;
     unsigned short int d_reclen;
-    //unsigned char d_type;
+    unsigned char d_type;
     char d_name[256];		/* We must not include limits.h! */
   };
 #endif
diff --git a/libc/sysdeps/linux/i386/bits/dirent.h b/libc/sysdeps/linux/i386/bits/dirent.h
index e299c7784..82d8663f2 100644
--- a/libc/sysdeps/linux/i386/bits/dirent.h
+++ b/libc/sysdeps/linux/i386/bits/dirent.h
@@ -30,7 +30,9 @@ struct dirent
     __off64_t d_off;
 #endif
     unsigned short int d_reclen;
-    //unsigned char d_type;
+#ifdef __USE_FILE_OFFSET64
+    unsigned char d_type;
+#endif
     char d_name[256];		/* We must not include limits.h! */
   };
 
@@ -40,7 +42,7 @@ struct dirent64
     __ino64_t d_ino;
     __off64_t d_off;
     unsigned short int d_reclen;
-    //unsigned char d_type;
+    unsigned char d_type;
     char d_name[256];		/* We must not include limits.h! */
   };
 #endif
diff --git a/libc/sysdeps/linux/m68k/bits/dirent.h b/libc/sysdeps/linux/m68k/bits/dirent.h
index bde9fa744..82d8663f2 100644
--- a/libc/sysdeps/linux/m68k/bits/dirent.h
+++ b/libc/sysdeps/linux/m68k/bits/dirent.h
@@ -30,7 +30,9 @@ struct dirent
     __off64_t d_off;
 #endif
     unsigned short int d_reclen;
-    /*unsigned char d_type; */
+#ifdef __USE_FILE_OFFSET64
+    unsigned char d_type;
+#endif
     char d_name[256];		/* We must not include limits.h! */
   };
 
@@ -40,7 +42,7 @@ struct dirent64
     __ino64_t d_ino;
     __off64_t d_off;
     unsigned short int d_reclen;
-    /*unsigned char d_type; */
+    unsigned char d_type;
     char d_name[256];		/* We must not include limits.h! */
   };
 #endif
diff --git a/libc/sysdeps/linux/mips/bits/dirent.h b/libc/sysdeps/linux/mips/bits/dirent.h
index 88b718672..82d8663f2 100644
--- a/libc/sysdeps/linux/mips/bits/dirent.h
+++ b/libc/sysdeps/linux/mips/bits/dirent.h
@@ -30,7 +30,9 @@ struct dirent
     __off64_t d_off;
 #endif
     unsigned short int d_reclen;
-    /*unsigned char d_type;*/
+#ifdef __USE_FILE_OFFSET64
+    unsigned char d_type;
+#endif
     char d_name[256];		/* We must not include limits.h! */
   };
 
@@ -40,7 +42,7 @@ struct dirent64
     __ino64_t d_ino;
     __off64_t d_off;
     unsigned short int d_reclen;
-    /*unsigned char d_type;*/
+    unsigned char d_type;
     char d_name[256];		/* We must not include limits.h! */
   };
 #endif
diff --git a/libc/sysdeps/linux/powerpc/bits/dirent.h b/libc/sysdeps/linux/powerpc/bits/dirent.h
index a2936a7c5..1d41f4dd3 100644
--- a/libc/sysdeps/linux/powerpc/bits/dirent.h
+++ b/libc/sysdeps/linux/powerpc/bits/dirent.h
@@ -40,7 +40,9 @@ struct dirent
     __off64_t d_off;
 #endif
     unsigned short int d_reclen;
-    //unsigned char d_type;
+#ifdef __USE_FILE_OFFSET64
+    unsigned char d_type;
+#endif
     char d_name[256];		/* We must not include limits.h! */
   };
 
@@ -50,7 +52,7 @@ struct dirent64
     __ino64_t d_ino;
     __off64_t d_off;
     unsigned short int d_reclen;
-    //unsigned char d_type;
+    unsigned char d_type;
     char d_name[256];		/* We must not include limits.h! */
   };
 #endif
diff --git a/libc/sysdeps/linux/sh/bits/dirent.h b/libc/sysdeps/linux/sh/bits/dirent.h
index 1754c7cbe..472ae1a04 100644
--- a/libc/sysdeps/linux/sh/bits/dirent.h
+++ b/libc/sysdeps/linux/sh/bits/dirent.h
@@ -40,6 +40,9 @@ struct dirent
     __off64_t d_off;
 #endif
     unsigned short int d_reclen;
+#ifdef __USE_FILE_OFFSET64
+    unsigned char d_type;
+#endif
     char d_name[256];		/* We must not include limits.h! */
   };
 
diff --git a/libc/sysdeps/linux/sparc/bits/dirent.h b/libc/sysdeps/linux/sparc/bits/dirent.h
index 88b718672..82d8663f2 100644
--- a/libc/sysdeps/linux/sparc/bits/dirent.h
+++ b/libc/sysdeps/linux/sparc/bits/dirent.h
@@ -30,7 +30,9 @@ struct dirent
     __off64_t d_off;
 #endif
     unsigned short int d_reclen;
-    /*unsigned char d_type;*/
+#ifdef __USE_FILE_OFFSET64
+    unsigned char d_type;
+#endif
     char d_name[256];		/* We must not include limits.h! */
   };
 
@@ -40,7 +42,7 @@ struct dirent64
     __ino64_t d_ino;
     __off64_t d_off;
     unsigned short int d_reclen;
-    /*unsigned char d_type;*/
+    unsigned char d_type;
     char d_name[256];		/* We must not include limits.h! */
   };
 #endif
diff --git a/libc/sysdeps/linux/v850/bits/dirent.h b/libc/sysdeps/linux/v850/bits/dirent.h
index 1754c7cbe..472ae1a04 100644
--- a/libc/sysdeps/linux/v850/bits/dirent.h
+++ b/libc/sysdeps/linux/v850/bits/dirent.h
@@ -40,6 +40,9 @@ struct dirent
     __off64_t d_off;
 #endif
     unsigned short int d_reclen;
+#ifdef __USE_FILE_OFFSET64
+    unsigned char d_type;
+#endif
     char d_name[256];		/* We must not include limits.h! */
   };
 
-- 
cgit v1.2.3