[Commits] r22815 - in /fsf/trunk/libc: ChangeLog sysdeps/mach/hurd/bits/ioctls.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Apr  9 00:01:51 2013
New Revision: 22815

Log:
Import glibc-mainline for 2013-04-09

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/mach/hurd/bits/ioctls.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Apr  9 00:01:51 2013
@@ -1,3 +1,9 @@
+2013-04-08  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	[BZ #14280]
+	* sysdeps/mach/hurd/bits/ioctls.h (_IOTS): Cast to enum __ioctl_datum
+	when computing value.
+
 2013-04-06  Carlos O'Donell  <carlos@xxxxxxxxxx>
 
 	* math/README.libm-test (How can I generate "libm-test-ulps"?):

Modified: fsf/trunk/libc/sysdeps/mach/hurd/bits/ioctls.h
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/bits/ioctls.h (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/bits/ioctls.h Tue Apr  9 00:01:51 2013
@@ -141,7 +141,7 @@
 
 /* Construct an individual type field for TYPE.  */
 #define _IOTS(type)	\
-  (sizeof (type) == 8 ? IOC_64 : (sizeof (type) >> 1))
+  (sizeof (type) == 8 ? IOC_64 : (enum __ioctl_datum) (sizeof (type) >> 1))
 
 /* Construct a type information field for
    a single argument of the scalar TYPE.  */

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