foo

2026-09-09 11:58:23 +08:00 · 2012-08-07 13:08:22 -07:00
9 changed files with 43 additions and 0 deletions
@@ -1,3 +1,18 @@
+2012-08-07  Roland McGrath  <roland@hack.frob.com>
+
+	* bits/typesizes.h
+	[__LP64__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro.
+	* sysdeps/unix/sysv/linux/s390/bits/typesizes.h
+	[__s390x__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro.
+	* sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+	[defined __arch64__ || defined __sparcv9]
+	(__BLKCNT_T_MATCHES_BLKCNT64_T): New macro.
+	* sysdeps/unix/sysv/linux/x86/bits/typesizes.h
+	[__x86_64__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro.
+	* bits/stat.h
+	[defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T]
+	(_STAT_MATCHES_STAT64): New macro.
+
 2012-08-07  Joseph Myers  <joseph@codesourcery.com>

 	* sysdeps/unix/sysv/linux/configure.in (arch_minimum_kernel):
@@ -100,4 +100,9 @@ struct stat64
  };
 #endif

+#if defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T
+/* Inform libc code that these two types are effectively identical.  */
+# define _STAT_MATCHES_STAT64	1
+#endif
+
 #endif	/* bits/stat.h */
@@ -69,6 +69,9 @@

 /* Same for ino_t and ino64_t.  */
 # define __INO_T_MATCHES_INO64_T	1
+
+/* Same for blkcnt_t and blkcnt64_t.  */
+# define __BLKCNT_T_MATCHES_BLKCNT64_T
 #endif

 /* Number of descriptors that can fit in an `fd_set'.  */
@@ -1,3 +1,8 @@
+2012-08-07  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+	[__LP64__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro.
+
 2012-08-02  Roland McGrath  <roland@hack.frob.com>

 	* sysdeps/unix/sysv/linux/generic/bits/typesizes.h
@@ -117,6 +117,9 @@ struct stat64
  };
 #endif

+/* Inform libc code that these two types are effectively identical.  */
+#define _STAT_MATCHES_STAT64	1
+
 #undef __ST_TIME

 /* Tell code we have these members.  */
@@ -70,6 +70,9 @@

 /* Same for ino_t and ino64_t.  */
 # define __INO_T_MATCHES_INO64_T	1
+
+/* Same for blkcnt_t and blkcnt64_t.  */
+# define __BLKCNT_T_MATCHES_BLKCNT64_T
 #endif

 /* Number of descriptors that can fit in an `fd_set'.  */
@@ -75,6 +75,9 @@

 /* Same for ino_t and ino64_t.  */
 # define __INO_T_MATCHES_INO64_T	1
+
+/* Same for blkcnt_t and blkcnt64_t.  */
+# define __BLKCNT_T_MATCHES_BLKCNT64_T
 #endif

 /* Number of descriptors that can fit in an `fd_set'.  */
@@ -69,6 +69,9 @@

 /* Same for ino_t and ino64_t.  */
 # define __INO_T_MATCHES_INO64_T	1
+
+/* Same for blkcnt_t and blkcnt64_t.  */
+# define __BLKCNT_T_MATCHES_BLKCNT64_T
 #endif

 /* Number of descriptors that can fit in an `fd_set'.  */
@@ -81,6 +81,9 @@

 /* Same for ino_t and ino64_t.  */
 # define __INO_T_MATCHES_INO64_T	1
+
+/* Same for blkcnt_t and blkcnt64_t.  */
+# define __BLKCNT_T_MATCHES_BLKCNT64_T
 #endif

 /* Number of descriptors that can fit in an `fd_set'.  */