aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-08 09:18:37 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-08 09:18:37 -0700
commitcdd915fd16872227c41fdff75b7a2602a987da5f (patch)
tree9514f5ee19dcfa387f688106f947e3435c05cc8d
parent5afee2dc60940365e6407f433537b5a3871abd51 (diff)
downloadglibc-cdd915fd16872227c41fdff75b7a2602a987da5f.tar
glibc-cdd915fd16872227c41fdff75b7a2602a987da5f.tar.gz
glibc-cdd915fd16872227c41fdff75b7a2602a987da5f.tar.bz2
glibc-cdd915fd16872227c41fdff75b7a2602a987da5f.zip
Missing #include updates for dirstream code move from unix to posix.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/i386/readdir64_r.c6
-rw-r--r--sysdeps/unix/sysv/linux/readdir64_r.c2
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8078f8a189..f47f48d5ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-08 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/unix/sysv/linux/readdir64_r.c: Update #include for
+ sysdeps/unix -> sysdeps/posix move.
+ * sysdeps/unix/sysv/linux/i386/readdir64_r.c: Likewise.
+
2012-08-07 Allan McRae <allan@archlinux.org>
[BZ #14303]
diff --git a/sysdeps/unix/sysv/linux/i386/readdir64_r.c b/sysdeps/unix/sysv/linux/i386/readdir64_r.c
index 3b3116c01e..8471f03dcf 100644
--- a/sysdeps/unix/sysv/linux/i386/readdir64_r.c
+++ b/sysdeps/unix/sysv/linux/i386/readdir64_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2004, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2000-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
@@ -20,7 +20,7 @@
#define DIRENT_TYPE struct dirent64
#define GETDENTS_64BIT_ALIGNED 1
-#include <sysdeps/unix/readdir_r.c>
+#include <sysdeps/posix/readdir_r.c>
#undef __READDIR_R
#undef __GETDENTS
@@ -38,7 +38,7 @@ versioned_symbol (libc, __readdir64_r, readdir64_r, GLIBC_2_2);
#define __GETDENTS __old_getdents64
#define DIRENT_TYPE struct __old_dirent64
-#include <sysdeps/unix/readdir_r.c>
+#include <sysdeps/posix/readdir_r.c>
compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1);
#endif
diff --git a/sysdeps/unix/sysv/linux/readdir64_r.c b/sysdeps/unix/sysv/linux/readdir64_r.c
index bce56124ef..3dfbf4fd2c 100644
--- a/sysdeps/unix/sysv/linux/readdir64_r.c
+++ b/sysdeps/unix/sysv/linux/readdir64_r.c
@@ -2,6 +2,6 @@
#define __GETDENTS __getdents64
#define DIRENT_TYPE struct dirent64
-#include <sysdeps/unix/readdir_r.c>
+#include <sysdeps/posix/readdir_r.c>
weak_alias (__readdir64_r, readdir64_r)