aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-07-25 12:48:41 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-07-25 12:48:41 +0200
commit3b43e4e4d444fb5c2360f689679db85826627754 (patch)
tree22b0ab02b599bf944f810b114bf37b03c9240f6c /sysdeps/unix/sysv
parent7e681561a3aea7aa8f21fb031a7c778147dfdf5b (diff)
downloadglibc-3b43e4e4d444fb5c2360f689679db85826627754.tar
glibc-3b43e4e4d444fb5c2360f689679db85826627754.tar.gz
glibc-3b43e4e4d444fb5c2360f689679db85826627754.tar.bz2
glibc-3b43e4e4d444fb5c2360f689679db85826627754.zip
Linux: Move getdents64 to <dirent.h>fw/getdents64
This matches the location of the declaration in musl.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/bits/dirent_ext.h33
-rw-r--r--sysdeps/unix/sysv/linux/bits/unistd_ext.h6
2 files changed, 33 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/dirent_ext.h b/sysdeps/unix/sysv/linux/bits/dirent_ext.h
new file mode 100644
index 0000000000..bac8f95b8f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/bits/dirent_ext.h
@@ -0,0 +1,33 @@
+/* System-specific extensions of <dirent.h>. Linux version.
+ Copyright (C) 2019 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ 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/>. */
+
+#ifndef _DIRENT_H
+# error "Never include <bits/dirent_ext.h> directly; use <dirent.h> instead."
+#endif
+
+__BEGIN_DECLS
+
+#ifdef __USE_GNU
+/* Read from the directory descriptor FD into LENGTH bytes at BUFFER.
+ Return the number of bytes read on success (0 for end of
+ directory), and -1 for failure. */
+extern __ssize_t getdents64 (int __fd, void *__buffer, size_t __length)
+ __THROW __nonnull ((2));
+#endif
+
+__END_DECLS
diff --git a/sysdeps/unix/sysv/linux/bits/unistd_ext.h b/sysdeps/unix/sysv/linux/bits/unistd_ext.h
index 6e7b2bb83d..0061172f23 100644
--- a/sysdeps/unix/sysv/linux/bits/unistd_ext.h
+++ b/sysdeps/unix/sysv/linux/bits/unistd_ext.h
@@ -22,12 +22,6 @@
#ifdef __USE_GNU
-/* Read from the directory descriptor FD into LENGTH bytes at BUFFER.
- Return the number of bytes read on success (0 for end of
- directory), and -1 for failure. */
-extern ssize_t getdents64 (int __fd, void *__buffer, size_t __length)
- __THROW __nonnull ((2));
-
/* Return the kernel thread ID (TID) of the current thread. The
returned value is not subject to caching. Most Linux system calls
accept a TID in place of a PID. Using the TID to change properties