DINPUT: protect FF_STATUS usage

Marcelo Duarte marcelotduarte at gmail.com
Sun Sep 4 14:12:31 CDT 2005


Now it compiles...
Thank you!
Daniel Remenak escreveu:

>Changelog:
>Protect FF_STATUS usage to avoid compile errors on machines with old
>linux/input.h
>
>This patch should fix Marcelo Duarte's reported compile error on FC2.
>
>This patch was made against a copy of joystick_linuxinput.c that
>already had "linuxinput axis enumeration fixes" and "allow the
>creation of an effect while unacquired" applied to it, but it should
>apply to an earlier revision.
>
>--Daniel Remenak
>  
>
>------------------------------------------------------------------------
>
>--- ../wine2/dlls/dinput/joystick_linuxinput.c	2005-09-03 14:29:30.000000000 -0700
>+++ dlls/dinput/joystick_linuxinput.c	2005-09-03 23:00:35.000000000 -0700
>@@ -302,7 +302,9 @@
>   newDevice->ref = 1;
>   newDevice->joyfd = -1;
>   newDevice->dinput = dinput;
>+#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
>   newDevice->ff_state = FF_STATUS_STOPPED;
>+#endif
>   memcpy(&(newDevice->guid),rguid,sizeof(*rguid));
>   for (i=0;i<ABS_MAX;i++) {
>     newDevice->wantmin[i] = -32768;
>@@ -723,9 +725,11 @@
> 		break;
> 	    }
> 	    break;
>+#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
> 	case EV_FF_STATUS:
> 	    This->ff_state = ie.value;
> 	    break;
>+#endif
> 	default:
> 	    FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code);
> 	    break;
>  
>
>------------------------------------------------------------------------
>
>
>  
>




More information about the wine-devel mailing list