Mercurial > mplayer.hg
changeset 26080:90e9ac3ee4c0
joystick.c is only ever compiled on Linux, remove pointless #ifdef
around the whole file and dummy functions.
author | diego |
---|---|
date | Thu, 28 Feb 2008 18:32:17 +0000 |
parents | d6b05b1a9b3f |
children | 2cb4aabb7dd8 |
files | input/joystick.c |
diffstat | 1 files changed, 0 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/input/joystick.c Thu Feb 28 18:31:35 2008 +0000 +++ b/input/joystick.c Thu Feb 28 18:32:17 2008 +0000 @@ -24,8 +24,6 @@ #define JS_DEV "/dev/input/js0" #endif -#ifdef TARGET_LINUX - #include <linux/joystick.h> int axis[256]; @@ -145,18 +143,3 @@ return MP_INPUT_NOTHING; } - -#else /* TARGET_LINUX */ - -// dummy function - -int mp_input_joystick_init(char* dev) { - return -1; -} - -int mp_input_joystick_read(int fd) { - - return MP_INPUT_NOTHING; -} - -#endif /* TARGET_LINUX */