about summary refs log tree commit diff
path: root/ports
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-06 16:47:58 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-06 16:48:36 -0700
commit8e49df1d656c393e913b6c9343f491c59bd527b2 (patch)
treeac9cb93c6181621769aba412c5bb233498b896e5 /ports
parent03af952060fee063679864d82cdd76f94d56d263 (diff)
downloadglibc-8e49df1d656c393e913b6c9343f491c59bd527b2.tar.gz
glibc-8e49df1d656c393e913b6c9343f491c59bd527b2.tar.xz
glibc-8e49df1d656c393e913b6c9343f491c59bd527b2.zip
Clean up {alphasort,versionsort,scandir,scandirat}{,64} for struct dirent == struct dirent64.
Diffstat (limited to 'ports')
-rw-r--r--ports/ChangeLog.alpha5
-rw-r--r--ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h5
-rw-r--r--ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index b13857f92d..eb178ea601 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,5 +1,10 @@
 2012-08-02  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/alpha/bits/dirent.h
+	(_DIRENT_MATCHES_DIRENT64): New macro.
+
+2012-08-02  Roland McGrath  <roland@hack.frob.com>
+
 	* sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
 	(__OFF_T_MATCHES_OFF64_T): New macro.
 
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h
index f146466e68..487ad15253 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -51,4 +51,7 @@ struct dirent64
 #define _DIRENT_HAVE_D_OFF
 #define _DIRENT_HAVE_D_TYPE
 
+/* Inform libc code that these two types are effectively identical.  */
+#define _DIRENT_MATCHES_DIRENT64	1
+
 #endif /* bits/dirent.h */
diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
index 670c6d119f..d7d2a5c10d 100644
--- a/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+++ b/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
@@ -67,6 +67,9 @@
    for all ABI purposes, even if possibly expressed as different base types
    for C type-checking purposes.  */
 # define __OFF_T_MATCHES_OFF64_T	1
+
+/* Same for ino_t and ino64_t.  */
+# define __INO_T_MATCHES_INO64_T	1
 #endif
 
 /* Number of descriptors that can fit in an `fd_set'.  */