diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-07 22:26:09 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-07 22:26:09 +0100 |
| commit | f05826f07fc48a2dd44bf92170ce6c71b29f7693 (patch) | |
| tree | d8d6d1860088dbc3c4a76a721a28d239c6e38c19 | |
| parent | e86c5b6459e9803118cd4708e0ff024a27bf33f8 (diff) | |
hurd: add basic types for ioctls
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/ioctls.h | 23 |
2 files changed, 30 insertions, 1 deletions
@@ -28,6 +28,14 @@ * hurd/hurdselect.c (_hurd_select): Remove unreachable check for MACH_RCV_TIMED_OUT. + [BZ #4719] + * sysdeps/mach/hurd/bits/ioctls.h (_IOT__IOTBASE_long, _IOT_char, + _IOT_short, _IOT_int, _IOT_long, _IOT__IOTBASE_int8_t, + _IOT__IOTBASE_uint8_t, _IOT__IOTBASE_int16_t, _IOT__IOTBASE_uint16_t, + _IOT__IOTBASE_int32_t, _IOT__IOTBASE_uint32_t, _IOT__IOTBASE_int64_t, + _IOT__IOTBASE_uint64_t, _IOT__IOTBASE_size_t, _IOT__IOTBASE_ssize_t, + _IOTBASE_unsigned, _IOTBASE_signed): Define macros. + 2015-02-06 Roland McGrath <roland@hack.frob.com> * sysdeps/arm/sysdep.h [!PROF] [ARCH_HAS_T2 && !PIC] (LDR_GLOBAL): diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h index 19f6bb0ebb..ea317aff8d 100644 --- a/sysdeps/mach/hurd/bits/ioctls.h +++ b/sysdeps/mach/hurd/bits/ioctls.h @@ -148,9 +148,26 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_32, IOC_64 }; #define _IOT_SIMPLE(type) _IOT (_IOTS (type), 1, 0, 0, 0, 0) /* Basic C types. */ -#define _IOT__IOTBASE_int _IOT_SIMPLE (int) #define _IOT__IOTBASE_char _IOT_SIMPLE (char) #define _IOT__IOTBASE_short _IOT_SIMPLE (short) +#define _IOT__IOTBASE_int _IOT_SIMPLE (int) +#define _IOT__IOTBASE_long _IOT_SIMPLE (long) +#define _IOT_char _IOT_SIMPLE (char) +#define _IOT_short _IOT_SIMPLE (short) +#define _IOT_int _IOT_SIMPLE (int) +#define _IOT_long _IOT_SIMPLE (long) + +#define _IOT__IOTBASE_int8_t _IOT_SIMPLE (int8_t) +#define _IOT__IOTBASE_uint8_t _IOT_SIMPLE (uint8_t) +#define _IOT__IOTBASE_int16_t _IOT_SIMPLE (int16_t) +#define _IOT__IOTBASE_uint16_t _IOT_SIMPLE (uint16_t) +#define _IOT__IOTBASE_int32_t _IOT_SIMPLE (int32_t) +#define _IOT__IOTBASE_uint32_t _IOT_SIMPLE (uint32_t) +#define _IOT__IOTBASE_int64_t _IOT_SIMPLE (int64_t) +#define _IOT__IOTBASE_uint64_t _IOT_SIMPLE (uint64_t) + +#define _IOT__IOTBASE_size_t _IOT_SIMPLE (size_t) +#define _IOT__IOTBASE_ssize_t _IOT_SIMPLE (ssize_t) /* Standard flavors of ioctls. @@ -173,6 +190,10 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_32, IOC_64 }; #define _IOC_ENCODE_TYPE_1(typespec) _IOC_ENCODE_TYPE_2(typespec) #define _IOC_ENCODE_TYPE_2(typespec) _IOT_##typespec +/* Also, ignore signedness. */ +#define _IOTBASE_unsigned +#define _IOTBASE_signed + /* ioctls verbatim from 4.4 <sys/ioctl.h>. */ |