From cc6bc2a49b58d1351044f135ba8b4fa1d578989f Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 3 Jun 2006 00:27:53 +0100 Subject: [PATCH] --- yaml --- r: 28011 b: refs/heads/master c: d27317657ae18cfbc45def8f566e4c3ed1f51d74 h: refs/heads/master i: 28009: fe129ed546bbc031603c7f948a7e0aaec5e74306 28007: 8e681a645889fe41771f4e71ed9fb5e490f70e09 v: v3 --- [refs] | 2 +- trunk/include/linux/joystick.h | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 1ab121764df7..771529c7f89d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b1c6ca73aa102e9dde5098f58c523bca0f8e2c3 +refs/heads/master: d27317657ae18cfbc45def8f566e4c3ed1f51d74 diff --git a/trunk/include/linux/joystick.h b/trunk/include/linux/joystick.h index 5fd20ddd7ae3..e2d3a18af456 100644 --- a/trunk/include/linux/joystick.h +++ b/trunk/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; };