Module: xenomai-3 Branch: master Commit: d5af062a1755f83e09cf380e8f4cac7cef5cdde0 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=d5af062a1755f83e09cf380e8f4cac7cef5cdde0
Author: Philippe Gerum <r...@xenomai.org> Date: Thu Oct 30 15:32:16 2014 +0100 lib/cobalt: fix ioctl() prototype --- include/cobalt/sys/ioctl.h | 2 +- lib/cobalt/rtdm.c | 4 ++-- lib/cobalt/wrappers.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/cobalt/sys/ioctl.h b/include/cobalt/sys/ioctl.h index 00c9735..553aa56 100644 --- a/include/cobalt/sys/ioctl.h +++ b/include/cobalt/sys/ioctl.h @@ -27,7 +27,7 @@ extern "C" { #endif -COBALT_DECL(int, ioctl(int fildes, unsigned long int request, ...)); +COBALT_DECL(int, ioctl(int fildes, unsigned int request, ...)); #ifdef __cplusplus } diff --git a/lib/cobalt/rtdm.c b/lib/cobalt/rtdm.c index 26c271a..4e1e24e 100644 --- a/lib/cobalt/rtdm.c +++ b/lib/cobalt/rtdm.c @@ -98,7 +98,7 @@ COBALT_IMPL(int, close, (int fd)) return __STD(close(fd)); } -static int do_ioctl(int fd, unsigned long request, void *arg) +static int do_ioctl(int fd, unsigned int request, void *arg) { int ret, oldtype; @@ -129,7 +129,7 @@ COBALT_IMPL(int, fcntl, (int fd, int cmd, ...)) return __STD(fcntl(fd, cmd, arg)); } -COBALT_IMPL(int, ioctl, (int fd, unsigned long int request, ...)) +COBALT_IMPL(int, ioctl, (int fd, unsigned int request, ...)) { va_list ap; void *arg; diff --git a/lib/cobalt/wrappers.c b/lib/cobalt/wrappers.c index 30522a4..106b466 100644 --- a/lib/cobalt/wrappers.c +++ b/lib/cobalt/wrappers.c @@ -183,7 +183,7 @@ int __real_fcntl(int fd, int cmd, ...) } __weak -int __real_ioctl(int fd, unsigned long int request, ...) +int __real_ioctl(int fd, unsigned int request, ...) { va_list ap; void *arg; _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git