This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-157-g2df1f7b
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Aug 2011 17:02:54 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-157-g2df1f7b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 2df1f7be58b2dfc80d29e7d53415df48949340ce (commit)
via 14d96785125abee5e9a49a1c3037f35a581750bd (commit)
from 6761ac045dd33da3e0e5c79b0879a0d7406b439e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2df1f7be58b2dfc80d29e7d53415df48949340ce
commit 2df1f7be58b2dfc80d29e7d53415df48949340ce
Merge: 14d9678 6761ac0
Author: Ulrich Drepper <drepper@gmail.com>
Date: Thu Aug 11 13:02:45 2011 -0400
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
diff --cc ChangeLog
index 8ac7d9d,6af37e0..c8bb204
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,19 @@@
+2011-08-10 Andreas Schwab <schwab@redhat.com>
+
+ * include/dirent.h: Add libc_hidden_proto for scandirat and
+ scandirat64. Don't declare __scandirat64.
+ * dirent/scandirat.c: Add libc_hidden_def.
+ * dirent/scandirat64.c (SCANDIRAT): Remove underscores.
+ * sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise.
+
+ 2011-08-10 David S. Miller <davem@davemloft.net>
+
+ * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Add missing comma in
+ enum.
+ * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
+
2011-08-09 Ulrich Drepper <drepper@gmail.com>
* Versions.def [libc]: Add GLIBC_2.15.
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=14d96785125abee5e9a49a1c3037f35a581750bd
commit 14d96785125abee5e9a49a1c3037f35a581750bd
Author: Andreas Schwab <schwab@redhat.com>
Date: Thu Aug 11 11:41:09 2011 -0400
Clean up PLT use for scandirat
diff --git a/ChangeLog b/ChangeLog
index 3ca8232..8ac7d9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-10 Andreas Schwab <schwab@redhat.com>
+
+ * include/dirent.h: Add libc_hidden_proto for scandirat and
+ scandirat64. Don't declare __scandirat64.
+ * dirent/scandirat.c: Add libc_hidden_def.
+ * dirent/scandirat64.c (SCANDIRAT): Remove underscores.
+ * sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise.
+
2011-08-09 Ulrich Drepper <drepper@gmail.com>
* Versions.def [libc]: Add GLIBC_2.15.
diff --git a/dirent/scandirat.c b/dirent/scandirat.c
index e6f5ece..3eda970 100644
--- a/dirent/scandirat.c
+++ b/dirent/scandirat.c
@@ -141,3 +141,4 @@ SCANDIRAT (dfd, dir, namelist, select, cmp)
return c.cnt;
}
+libc_hidden_def (SCANDIRAT)
diff --git a/dirent/scandirat64.c b/dirent/scandirat64.c
index c4afb90..d41bdd1 100644
--- a/dirent/scandirat64.c
+++ b/dirent/scandirat64.c
@@ -18,11 +18,9 @@
#include <dirent.h>
-#define SCANDIRAT __scandirat64
+#define SCANDIRAT scandirat64
#define READDIR __readdir64
#define DIRENT_TYPE struct dirent64
#define SKIP_SCANDIR_CANCEL 1
#include "scandirat.c"
-
-weak_alias (__scandirat64, scandirat64)
diff --git a/include/dirent.h b/include/dirent.h
index 9ed5876..7dbf622 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -27,11 +27,6 @@ extern int __scandir64 (__const char * __dir,
int (*__selector) (__const struct dirent64 *),
int (*__cmp) (__const struct dirent64 **,
__const struct dirent64 **));
-extern int __scandirat64 (int __dfd, __const char * __dir,
- struct dirent64 *** __namelist,
- int (*__selector) (__const struct dirent64 *),
- int (*__cmp) (__const struct dirent64 **,
- __const struct dirent64 **));
extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
internal_function;
extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
@@ -47,5 +42,7 @@ extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
extern void __scandir_cancel_handler (void *arg);
libc_hidden_proto (rewinddir)
+libc_hidden_proto (scandirat)
+libc_hidden_proto (scandirat64)
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/scandir64.c b/sysdeps/unix/sysv/linux/i386/scandir64.c
index dacac0a..ae1970e 100644
--- a/sysdeps/unix/sysv/linux/i386/scandir64.c
+++ b/sysdeps/unix/sysv/linux/i386/scandir64.c
@@ -19,7 +19,7 @@
#include <dirent.h>
#define SCANDIR __scandir64
-#define SCANDIRAT __scandirat64
+#define SCANDIRAT scandirat64
#define READDIR __readdir64
#define DIRENT_TYPE struct dirent64
#define SKIP_SCANDIR_CANCEL 1
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
dirent/scandirat.c | 1 +
dirent/scandirat64.c | 4 +---
include/dirent.h | 7 ++-----
sysdeps/unix/sysv/linux/i386/scandir64.c | 2 +-
5 files changed, 13 insertions(+), 9 deletions(-)
hooks/post-receive
--
GNU C Library master sources