From: Ulrich Drepper <drepper@gmail.com>
Date: Fri, 20 May 2011 01:09:29 +0000 (-0400)
Subject: Cleanup namespace use.
X-Git-Tag: glibc-2.14~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed690b2f24bbc4d9c541fc81a7c67e6dc5678a96;p=thirdparty%2Fglibc.git

Cleanup namespace use.
---

diff --git a/ChangeLog b/ChangeLog
index c1bf490c1af..ada149527c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-19  Ulrich Drepper  <drepper@gmail.com>
+
+	* libio/freopen.c (freopen): Use __dup2, not dup2.
+	* libio/freopen64.c (freopen64): Likewise.
+
 2011-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #12775]
diff --git a/libio/freopen.c b/libio/freopen.c
index 20eda9d0f5e..ee98b6e5801 100644
--- a/libio/freopen.c
+++ b/libio/freopen.c
@@ -102,7 +102,7 @@ freopen (filename, mode, fp)
 	      if (errno == ENOSYS)
 		__have_dup3 = -1;
 
-	      dup2 (_IO_fileno (result), fd);
+	      __dup2 (_IO_fileno (result), fd);
 	      if ((result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0)
 		__fcntl (fd, F_SETFD, FD_CLOEXEC);
 	    }
diff --git a/libio/freopen64.c b/libio/freopen64.c
index 99045c64199..6c4a20f9a38 100644
--- a/libio/freopen64.c
+++ b/libio/freopen64.c
@@ -86,7 +86,7 @@ freopen64 (filename, mode, fp)
 	      if (errno == ENOSYS)
 		__have_dup3 = -1;
 
-	      dup2 (_IO_fileno (result), fd);
+	      __dup2 (_IO_fileno (result), fd);
 	      if ((result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0)
 		__fcntl (fd, F_SETFD, FD_CLOEXEC);
 	    }