From 94c3cff5832a7f3f0a53674a644a7d3b3633eb8f Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Tue, 28 Feb 2012 13:16:05 +0100
Subject: [PATCH] Rename dirfd to __dirfd, add weak_alias.

---
 dirent/dirfd.c            | 5 +++--
 sysdeps/mach/hurd/dirfd.c | 5 +++--
 sysdeps/unix/dirfd.c      | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dirent/dirfd.c b/dirent/dirfd.c
index 026421f33b..569484c5af 100644
--- a/dirent/dirfd.c
+++ b/dirent/dirfd.c
@@ -1,5 +1,5 @@
 /* Return the file descriptor used by a DIR stream.  Stub version.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 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
@@ -21,12 +21,13 @@
 #include <errno.h>
 
 int
-dirfd (dirp)
+__dirfd (dirp)
      DIR *dirp;
 {
   __set_errno (ENOSYS);
   return -1;
 }
+weak_alias(__dirfd, dirfd)
 
 stub_warning (dirfd)
 #include <stub-tag.h>
diff --git a/sysdeps/mach/hurd/dirfd.c b/sysdeps/mach/hurd/dirfd.c
index 587ae7b2f1..975bc02863 100644
--- a/sysdeps/mach/hurd/dirfd.c
+++ b/sysdeps/mach/hurd/dirfd.c
@@ -1,5 +1,5 @@
 /* dirfd -- Return the file descriptor used by a DIR stream.  Hurd version.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 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
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 int
-dirfd (DIR *dirp)
+__dirfd (DIR *dirp)
 {
   int fd;
   __mutex_lock (&_hurd_dtable_lock);
@@ -38,3 +38,4 @@ dirfd (DIR *dirp)
 
   return fd;
 }
+weak_alias(__dirfd, dirfd)
diff --git a/sysdeps/unix/dirfd.c b/sysdeps/unix/dirfd.c
index 536c44e30e..0cdacf9163 100644
--- a/sysdeps/unix/dirfd.c
+++ b/sysdeps/unix/dirfd.c
@@ -1,5 +1,5 @@
 /* Return the file descriptor used by a DIR stream.  Unix version.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 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
@@ -22,8 +22,9 @@
 #undef dirfd
 
 int
-dirfd (dirp)
+__dirfd (dirp)
      DIR *dirp;
 {
   return dirp->fd;
 }
+weak_alias(__dirfd, dirfd)