From 8e49df1d656c393e913b6c9343f491c59bd527b2 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Mon, 6 Aug 2012 16:47:58 -0700
Subject: Clean up {alphasort,versionsort,scandir,scandirat}{,64} for struct
 dirent == struct dirent64.

---
 bits/dirent.h    | 5 ++++-
 bits/typesizes.h | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'bits')

diff --git a/bits/dirent.h b/bits/dirent.h
index ac1928d3db..5b803c6539 100644
--- a/bits/dirent.h
+++ b/bits/dirent.h
@@ -1,5 +1,5 @@
 /* Directory entry structure `struct dirent'.  Stub version.
-   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
@@ -33,3 +33,6 @@ struct dirent64
     int d_fileno;
   };
 #endif
+
+/* Inform libc code that these two types are identical.  */
+#define _DIRENT_MATCHES_DIRENT64	1
diff --git a/bits/typesizes.h b/bits/typesizes.h
index 09959f2b45..c3debd0dd6 100644
--- a/bits/typesizes.h
+++ b/bits/typesizes.h
@@ -66,6 +66,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'.  */
-- 
cgit v1.2.3