Merged some #ifdef stuff from 0.11.3. (Not sure what it is

good for, but it doesn't hurt anything.)
This commit is contained in:
Peter Osterlund
2003-05-03 15:06:04 +02:00
parent 7d6b34aaf5
commit df584e849c

View File

@@ -48,7 +48,9 @@
#include <xisb.h>
#include <exevents.h> /* Needed for InitValuator/Proximity stuff */
#include "mipointer.h"
#ifdef XFREE_4_0_3
#include <xf86Optrec.h> /* needed for Options */
#endif
/*****************************************************************************
@@ -141,7 +143,11 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
{
LocalDevicePtr local;
SynapticsPrivatePtr priv;
#ifdef XFREE_4_0_3
XF86OptionPtr optList;
#else
pointer optList;
#endif
char *str_par;
int shmid;