From: Roland McGrath Date: Mon, 8 Apr 2013 21:31:38 +0000 (-0700) Subject: BZ#14280: Fix Hurd ioctl macro to avoid warning. X-Git-Tag: glibc-2.18~418 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61c23e6234db0e94cd850e88536401910ac61516;p=thirdparty%2Fglibc.git BZ#14280: Fix Hurd ioctl macro to avoid warning. --- diff --git a/ChangeLog b/ChangeLog index 9e33f24922e..20be9856308 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-04-08 Roland McGrath + + [BZ #14280] + * sysdeps/mach/hurd/bits/ioctls.h (_IOTS): Cast to enum __ioctl_datum + when computing value. + 2013-04-06 Carlos O'Donell * 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 4917055f910..fe3ca082648 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. */