[Commits] r21678 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Nov 13 00:01:47 2012
New Revision: 21678

Log:
Import glibc-mainline for 2012-11-13

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Nov 13 00:01:47 2012
@@ -1,3 +1,10 @@
+2012-11-11  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Include
+	inttypes.h
+	(__get_clockfreq_via_proc_openprom): Use __open, __read, and
+	__close rather than their public counterparts.
+
 2012-11-10  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* conform/data/semaphore.h-data [XPG3 || XPG4]: Disable whole

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c Tue Nov 13 00:01:47 2012
@@ -22,6 +22,7 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include <sys/ioctl.h>
 #include <libc-internal.h>
 #include <asm/openpromio.h>
@@ -123,14 +124,14 @@
 		      int clkfreq_fd;
 
 		      __stpcpy (prop, "/clock-frequency");
-		      clkfreq_fd = open (node, O_RDONLY);
+		      clkfreq_fd = __open (node, O_RDONLY);
 		      if (clkfreq_fd != -1)
 			{
-			  if (read (clkfreq_fd, type_string,
-				    sizeof (type_string)) > 0)
+			  if (__read (clkfreq_fd, type_string,
+				      sizeof (type_string)) > 0)
 			    result = (hp_timing_t)
 			      strtoumax (type_string, NULL, 16);
-			  close (clkfreq_fd);
+			  __close (clkfreq_fd);
 			}
 		    }
 		  __close (fd);

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits