summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Fredrik Hammar <hammy.lite@gmail.com>2010-02-17 11:04:30 -0800
committerRoland McGrath <roland@redhat.com>2010-02-17 11:04:30 -0800
commit0ea5278d33e7ad9b62c1d5d97cb287fdfcb8d977 (patch)
tree663fceb3925fc561a343d69378a9967a48c69d1d
parentd22ae6cf50dfb60e5f13fef8be5a3c8636733947 (diff)
downloadglibc-0ea5278d33e7ad9b62c1d5d97cb287fdfcb8d977.tar.gz
Use ioctl_handler_t typedef in Hurd ioctl macros.
-rw-r--r--ChangeLog5
-rw-r--r--hurd/hurd/ioctl.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1595a0a55e..5c5144b6fc 100644
--- 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 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) \