aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-04-08 14:31:38 -0700
committerRoland McGrath <roland@hack.frob.com>2013-04-08 14:31:38 -0700
commit61c23e6234db0e94cd850e88536401910ac61516 (patch)
tree7d01c810ef789d9b8cd6db0f9aa1e8a5a3d9c4f5
parent96497bb806e4a3f7105cd1b742c1cd4686780553 (diff)
downloadglibc-61c23e6234db0e94cd850e88536401910ac61516.zip
glibc-61c23e6234db0e94cd850e88536401910ac61516.tar.gz
glibc-61c23e6234db0e94cd850e88536401910ac61516.tar.bz2
BZ#14280: Fix Hurd ioctl macro to avoid warning.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/mach/hurd/bits/ioctls.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e33f24..20be985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-08 Roland McGrath <roland@hack.frob.com>
+
+ [BZ #14280]
+ * sysdeps/mach/hurd/bits/ioctls.h (_IOTS): Cast to enum __ioctl_datum
+ when computing value.
+
2013-04-06 Carlos O'Donell <carlos@redhat.com>
* math/README.libm-test (How can I generate "libm-test-ulps"?):
diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h
index 4917055..fe3ca08 100644
--- a/sysdeps/mach/hurd/bits/ioctls.h
+++ b/sysdeps/mach/hurd/bits/ioctls.h
@@ -141,7 +141,7 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_32, IOC_64 };
/* 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. */