From 8e49df1d656c393e913b6c9343f491c59bd527b2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 6 Aug 2012 16:47:58 -0700 Subject: Clean up {alphasort,versionsort,scandir,scandirat}{,64} for struct dirent == struct dirent64. --- ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h | 5 ++++- ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'ports/sysdeps') 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'. */ -- cgit 1.4.1