about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-19 21:09:29 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-19 21:09:29 -0400
commited690b2f24bbc4d9c541fc81a7c67e6dc5678a96 (patch)
tree8eb04a0eb7a36a6ae9cb8022061ad72b5b7218a8
parentf5f312ebe06920f8cdd389ff42713a7088898a11 (diff)
downloadglibc-ed690b2f24bbc4d9c541fc81a7c67e6dc5678a96.tar.gz
glibc-ed690b2f24bbc4d9c541fc81a7c67e6dc5678a96.tar.xz
glibc-ed690b2f24bbc4d9c541fc81a7c67e6dc5678a96.zip
Cleanup namespace use.
-rw-r--r--ChangeLog5
-rw-r--r--libio/freopen.c2
-rw-r--r--libio/freopen64.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c1bf490c1a..ada149527c 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 20eda9d0f5..ee98b6e580 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 99045c6419..6c4a20f9a3 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);
 	    }