diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-06-03 00:27:53 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-03 00:27:53 +0100 |
commit | d27317657ae18cfbc45def8f566e4c3ed1f51d74 (patch) | |
tree | 6523aa4dc2f3a9b8c788fba931b6cfb7a85135aa /include/linux/joystick.h | |
parent | 7b1c6ca73aa102e9dde5098f58c523bca0f8e2c3 (diff) | |
download | linux-stable-d27317657ae18cfbc45def8f566e4c3ed1f51d74.tar.gz linux-stable-d27317657ae18cfbc45def8f566e4c3ed1f51d74.tar.bz2 linux-stable-d27317657ae18cfbc45def8f566e4c3ed1f51d74.zip |
Switch to __s32 types in joystick.h instead of C99 types for consistency.
The rest of the file uses these types instead of C99 types.
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/linux/joystick.h')
-rw-r--r-- | include/linux/joystick.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/linux/joystick.h b/include/linux/joystick.h index 5fd20ddd7ae3..e2d3a18af456 100644 --- a/include/linux/joystick.h +++ b/include/linux/joystick.h @@ -111,25 +111,25 @@ struct js_corr { #define JS_SET_ALL 8 struct JS_DATA_TYPE { - int32_t buttons; - int32_t x; - int32_t y; + __s32 buttons; + __s32 x; + __s32 y; }; struct JS_DATA_SAVE_TYPE_32 { - int32_t JS_TIMEOUT; - int32_t BUSY; - int32_t JS_EXPIRETIME; - int32_t JS_TIMELIMIT; + __s32 JS_TIMEOUT; + __s32 BUSY; + __s32 JS_EXPIRETIME; + __s32 JS_TIMELIMIT; struct JS_DATA_TYPE JS_SAVE; struct JS_DATA_TYPE JS_CORR; }; struct JS_DATA_SAVE_TYPE_64 { - int32_t JS_TIMEOUT; - int32_t BUSY; - int64_t JS_EXPIRETIME; - int64_t JS_TIMELIMIT; + __s32 JS_TIMEOUT; + __s32 BUSY; + __s64 JS_EXPIRETIME; + __s64 JS_TIMELIMIT; struct JS_DATA_TYPE JS_SAVE; struct JS_DATA_TYPE JS_CORR; }; |