diff options
author | Andreas Schwab <schwab@redhat.com> | 2010-02-22 16:34:12 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-02-22 16:41:22 +0100 |
commit | 2b6e16c5e2fa8ad12b02a218ba32d63a4dffda18 (patch) | |
tree | b931e143f212d5b656497bb0c3f3e3a413fc78e1 /hurd/hurd | |
parent | 0c3f133ed106996172dd2c106b22e38ce695e63d (diff) | |
parent | 199428c19774c12b3c4b6e6486ea9d4a021288af (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'hurd/hurd')
-rw-r--r-- | hurd/hurd/ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hurd/hurd/ioctl.h b/hurd/hurd/ioctl.h index ee156f02f9..e5ab3dc965 100644 --- a/hurd/hurd/ioctl.h +++ b/hurd/hurd/ioctl.h @@ -57,7 +57,7 @@ extern int hurd_register_ioctl_handler (int first_request, int last_request, static const struct ioctl_handler handler##_ioctl_handler##moniker \ __attribute__ ((__unused__)) = \ { _IOC_NOTYPE (first), _IOC_NOTYPE (last), \ - (int (*) (int, int, void *)) (handler), NULL }; \ + (ioctl_handler_t) (handler), NULL }; \ text_set_element (_hurd_ioctl_handler_lists, \ handler##_ioctl_handler##moniker) #define _HURD_HANDLE_IOCTLS(handler, first, last) \ |