[MPlayer-cvslog] r26112 - trunk/input/joystick.c
diego
subversion at mplayerhq.hu
Thu Feb 28 19:32:18 CET 2008
Author: diego
Date: Thu Feb 28 19:32:17 2008
New Revision: 26112
Log:
joystick.c is only ever compiled on Linux, remove pointless #ifdef
around the whole file and dummy functions.
Modified:
trunk/input/joystick.c
Modified: trunk/input/joystick.c
==============================================================================
--- trunk/input/joystick.c (original)
+++ trunk/input/joystick.c Thu Feb 28 19:32:17 2008
@@ -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 */
More information about the MPlayer-cvslog
mailing list