diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-06-02 19:27:53 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-02 19:27:53 -0400 |
commit | d27317657ae18cfbc45def8f566e4c3ed1f51d74 (patch) | |
tree | 6523aa4dc2f3a9b8c788fba931b6cfb7a85135aa /include/linux/joystick.h | |
parent | 7b1c6ca73aa102e9dde5098f58c523bca0f8e2c3 (diff) |
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 { | |||
111 | #define JS_SET_ALL 8 | 111 | #define JS_SET_ALL 8 |
112 | 112 | ||
113 | struct JS_DATA_TYPE { | 113 | struct JS_DATA_TYPE { |
114 | int32_t buttons; | 114 | __s32 buttons; |
115 | int32_t x; | 115 | __s32 x; |
116 | int32_t y; | 116 | __s32 y; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | struct JS_DATA_SAVE_TYPE_32 { | 119 | struct JS_DATA_SAVE_TYPE_32 { |
120 | int32_t JS_TIMEOUT; | 120 | __s32 JS_TIMEOUT; |
121 | int32_t BUSY; | 121 | __s32 BUSY; |
122 | int32_t JS_EXPIRETIME; | 122 | __s32 JS_EXPIRETIME; |
123 | int32_t JS_TIMELIMIT; | 123 | __s32 JS_TIMELIMIT; |
124 | struct JS_DATA_TYPE JS_SAVE; | 124 | struct JS_DATA_TYPE JS_SAVE; |
125 | struct JS_DATA_TYPE JS_CORR; | 125 | struct JS_DATA_TYPE JS_CORR; |
126 | }; | 126 | }; |
127 | 127 | ||
128 | struct JS_DATA_SAVE_TYPE_64 { | 128 | struct JS_DATA_SAVE_TYPE_64 { |
129 | int32_t JS_TIMEOUT; | 129 | __s32 JS_TIMEOUT; |
130 | int32_t BUSY; | 130 | __s32 BUSY; |
131 | int64_t JS_EXPIRETIME; | 131 | __s64 JS_EXPIRETIME; |
132 | int64_t JS_TIMELIMIT; | 132 | __s64 JS_TIMELIMIT; |
133 | struct JS_DATA_TYPE JS_SAVE; | 133 | struct JS_DATA_TYPE JS_SAVE; |
134 | struct JS_DATA_TYPE JS_CORR; | 134 | struct JS_DATA_TYPE JS_CORR; |
135 | }; | 135 | }; |