Use ioctl_handler_t typedef in Hurd ioctl macros.

diff --git a/ChangeLog b/ChangeLog
index 1595a0a..5c5144b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-17  Carl Fredrik Hammar  <hammy.lite@gmail.com>
+
+       * hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Cast to
+       `ioctl_handler_t'.
+
 2010-02-15  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/i386/i686/multiarch/memcmp-sse4.S: Fix unwind info.

diff --git a/hurd/hurd/ioctl.h b/hurd/hurd/ioctl.h
index ee156f0..e5ab3dc 100644 (file)
--- 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)                             \