summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-28 18:32:17 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-28 18:32:17 +0000
commita21190b9d3ba6bdf72097077963db9bd40bc6dad (patch)
tree4327850416fd131b4d9cb0a1e97824981072322e /input
parent090df4eaa63fcc602e3e3e1b00a9389a409453c9 (diff)
downloadmpv-a21190b9d3ba6bdf72097077963db9bd40bc6dad.tar.bz2
mpv-a21190b9d3ba6bdf72097077963db9bd40bc6dad.tar.xz
joystick.c is only ever compiled on Linux, remove pointless #ifdef
around the whole file and dummy functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26112 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/joystick.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/input/joystick.c b/input/joystick.c
index 0fb2c041ed..ec3720548d 100644
--- a/input/joystick.c
+++ b/input/joystick.c
@@ -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 @@ int mp_input_joystick_read(int fd) {
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 */