diff --git a/ChangeLog b/ChangeLog index b2641ed4cd..1cd494b661 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,30 @@ 2012-08-07 Roland McGrath + * sysdeps/unix/closedir.c: Renamed to ... + * sysdeps/posix/closedir.c: ... here. + * sysdeps/unix/dirfd.c: Renamed to ... + * sysdeps/posix/dirfd.c: ... here. + * sysdeps/unix/dirstream.h: Renamed to ... + * sysdeps/posix/dirstream.h: ... here. + * sysdeps/unix/fdopendir.c: Renamed to ... + * sysdeps/posix/fdopendir.c: ... here. + * sysdeps/unix/opendir.c: Renamed to ... + * sysdeps/posix/opendir.c: ... here. + * sysdeps/unix/readdir.c: Renamed to ... + * sysdeps/posix/readdir.c: ... here. + * sysdeps/unix/readdir_r.c: Renamed to ... + * sysdeps/posix/readdir_r.c: ... here. + * sysdeps/unix/rewinddir.c: Renamed to ... + * sysdeps/posix/rewinddir.c: ... here. + * sysdeps/unix/seekdir.c: Renamed to ... + * sysdeps/posix/seekdir.c: ... here. + * sysdeps/unix/telldir.c: Renamed to ... + * sysdeps/posix/telldir.c: ... here. + * sysdeps/unix/sysv/linux/opendir.c: Update #include. + * sysdeps/unix/sysv/linux/readdir64.c: Likewise. + * sysdeps/unix/sysv/linux/i386/readdir64.c: Likewise. + * sysdeps/unix/sysv/linux/wordsize-64/readdir.c: Likewise. + * sysdeps/unix/bsd/bsd4.4/bits/fcntl.h: Renamed to ... * bits/fcntl.h: ... here. diff --git a/sysdeps/unix/closedir.c b/sysdeps/posix/closedir.c similarity index 100% rename from sysdeps/unix/closedir.c rename to sysdeps/posix/closedir.c diff --git a/sysdeps/unix/dirfd.c b/sysdeps/posix/dirfd.c similarity index 100% rename from sysdeps/unix/dirfd.c rename to sysdeps/posix/dirfd.c diff --git a/sysdeps/unix/dirstream.h b/sysdeps/posix/dirstream.h similarity index 100% rename from sysdeps/unix/dirstream.h rename to sysdeps/posix/dirstream.h diff --git a/sysdeps/unix/fdopendir.c b/sysdeps/posix/fdopendir.c similarity index 100% rename from sysdeps/unix/fdopendir.c rename to sysdeps/posix/fdopendir.c diff --git a/sysdeps/unix/opendir.c b/sysdeps/posix/opendir.c similarity index 100% rename from sysdeps/unix/opendir.c rename to sysdeps/posix/opendir.c diff --git a/sysdeps/unix/readdir.c b/sysdeps/posix/readdir.c similarity index 100% rename from sysdeps/unix/readdir.c rename to sysdeps/posix/readdir.c diff --git a/sysdeps/unix/readdir_r.c b/sysdeps/posix/readdir_r.c similarity index 100% rename from sysdeps/unix/readdir_r.c rename to sysdeps/posix/readdir_r.c diff --git a/sysdeps/unix/rewinddir.c b/sysdeps/posix/rewinddir.c similarity index 100% rename from sysdeps/unix/rewinddir.c rename to sysdeps/posix/rewinddir.c diff --git a/sysdeps/unix/seekdir.c b/sysdeps/posix/seekdir.c similarity index 100% rename from sysdeps/unix/seekdir.c rename to sysdeps/posix/seekdir.c diff --git a/sysdeps/unix/telldir.c b/sysdeps/posix/telldir.c similarity index 100% rename from sysdeps/unix/telldir.c rename to sysdeps/posix/telldir.c diff --git a/sysdeps/unix/sysv/linux/i386/readdir64.c b/sysdeps/unix/sysv/linux/i386/readdir64.c index 570c74161c..2023fa5c5e 100644 --- a/sysdeps/unix/sysv/linux/i386/readdir64.c +++ b/sysdeps/unix/sysv/linux/i386/readdir64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2004 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 @@ -19,7 +19,7 @@ #define __GETDENTS __getdents64 #define DIRENT_TYPE struct dirent64 -#include +#include #include @@ -37,7 +37,7 @@ versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2); #define __GETDENTS __old_getdents64 #define DIRENT_TYPE struct __old_dirent64 -#include +#include compat_symbol (libc, __old_readdir64, readdir64, GLIBC_2_1); #endif diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c index b0bb80d397..614cba101d 100644 --- a/sysdeps/unix/sysv/linux/opendir.c +++ b/sysdeps/unix/sysv/linux/opendir.c @@ -17,4 +17,4 @@ #define O_DIRECTORY_WORKS 1 -#include +#include diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c index e2c5002390..224f53db88 100644 --- a/sysdeps/unix/sysv/linux/readdir64.c +++ b/sysdeps/unix/sysv/linux/readdir64.c @@ -2,6 +2,6 @@ #define __GETDENTS __getdents64 #define DIRENT_TYPE struct dirent64 -#include +#include weak_alias (__readdir64, readdir64) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/readdir.c b/sysdeps/unix/sysv/linux/wordsize-64/readdir.c index 300ebb2629..e197d93b00 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/readdir.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir.c @@ -1,6 +1,6 @@ #define readdir64 __no_readdir64_decl #define __readdir64 __no___readdir64_decl -#include +#include #undef __readdir64 strong_alias (__readdir, __readdir64) #undef readdir64 diff --git a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c index 12ca1a1ef7..5ed8e955e2 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c @@ -1,5 +1,5 @@ #define readdir64_r __no_readdir64_r_decl #define GETDENTS_64BIT_ALIGNED 1 -#include +#include #undef readdir64_r weak_alias (__readdir_r, readdir64_r)