Attachment #197643 for bug #276607

View | Details | Raw Unified | Return to bug 276607
Collapse All | Expand All




#endif

#include <sys/types.h>
#include "xf86Version.h"
#if XORG_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
#define XFREE86_V4 1
#endif
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"


#define SYSCALL(call) while(((call) == -1) && (errno == EINTR))

#ifdef XFREE86_V4

struct hiddev_event
{
   unsigned hid;

	 return !Success;
      if (InitProximityClassDeviceStruct(pJS_X) == FALSE)
	 return !Success;
      if (InitValuatorClassDeviceStruct(pJS_X, nbaxes, local->history_size,
					local->history_size,
					Absolute | OutOfProximity) == FALSE)
	 return !Success;
      else

   xf86JS_XUnplug
};
#endif
#endif

Return to bug 276607

Lines 27-36 Link Here

(-)xf86-input-jamstudio-1.2.0/src/js_x.c.orig (-9 / +1 lines)
27	#endif	27	#endif
28		28
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include "xf86Version.h"
31	#if XORG_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
32	#define XFREE86_V4 1
33	#endif
34	#include "misc.h"	30	#include "misc.h"
35	#include "xf86.h"	31	#include "xf86.h"
36	#include "xf86_OSproc.h"	32	#include "xf86_OSproc.h"
Lines 51-58 Link Here
51		47
52	#define SYSCALL(call) while(((call) == -1) && (errno == EINTR))	48	#define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
53		49
54	#ifdef XFREE86_V4
55
56	struct hiddev_event	50	struct hiddev_event
57	{	51	{
58	unsigned hid;	52	unsigned hid;
Lines 192-199 Link Here
192	return !Success;	186	return !Success;
193	if (InitProximityClassDeviceStruct(pJS_X) == FALSE)	187	if (InitProximityClassDeviceStruct(pJS_X) == FALSE)
194	return !Success;	188	return !Success;
195	if (InitValuatorClassDeviceStruct(pJS_X, nbaxes, xf86GetMotionEvents,	189	if (InitValuatorClassDeviceStruct(pJS_X, nbaxes, local->history_size,
196	local->history_size,
197	Absolute \| OutOfProximity) == FALSE)	190	Absolute \| OutOfProximity) == FALSE)
198	return !Success;	191	return !Success;
199	else	192	else
Lines 364-367 Link Here
364	xf86JS_XUnplug	357	xf86JS_XUnplug
365	};	358	};
366	#endif	359	#endif
367	#endif