aboutsummaryrefslogtreecommitdiff
path: root/lib/libc/include/aarch64-linux-gnu/bits/statfs.h
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-03-04 15:35:46 -0500
committerAndrew Kelley <andrew@ziglang.org>2020-03-04 15:35:46 -0500
commit3178807657f0d75646c9de11ba4b23ee556e70da (patch)
tree0e8f668368e68a3fe7b510ae00aaa5d48dc379b2 /lib/libc/include/aarch64-linux-gnu/bits/statfs.h
parent66e6f5586e314b6f4fac8b0ed0198f47ba80d4f3 (diff)
parent6cbd1ac51af4300ef11373d16771cf011fb6e572 (diff)
downloadzig-3178807657f0d75646c9de11ba4b23ee556e70da.tar.gz
zig-3178807657f0d75646c9de11ba4b23ee556e70da.zip
Merge remote-tracking branch 'origin/master' into llvm10
Diffstat (limited to 'lib/libc/include/aarch64-linux-gnu/bits/statfs.h')
-rw-r--r--lib/libc/include/aarch64-linux-gnu/bits/statfs.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/include/aarch64-linux-gnu/bits/statfs.h b/lib/libc/include/aarch64-linux-gnu/bits/statfs.h
index 8da970d4a9..61c27388e9 100644
--- a/lib/libc/include/aarch64-linux-gnu/bits/statfs.h
+++ b/lib/libc/include/aarch64-linux-gnu/bits/statfs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2019 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
@@ -14,13 +14,13 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
+ <https://www.gnu.org/licenses/>. */
#ifndef _SYS_STATFS_H
# error "Never include <bits/statfs.h> directly; use <sys/statfs.h> instead."
#endif
-#include <endian.h>
+#include <bits/endian.h>
#include <bits/types.h>
#include <bits/wordsize.h>
@@ -34,7 +34,7 @@
#if defined __USE_FILE_OFFSET64
# define __field64(type, type64, name) type64 name
-#elif __WORDSIZE == 64
+#elif __WORDSIZE == 64 || __STATFS_MATCHES_STATFS64
# define __field64(type, type64, name) type name
#elif __BYTE_ORDER == __LITTLE_ENDIAN
# define __field64(type, type64, name) \