From 7c8a64dc8e7c813439fd70b8fe4a278f99d82e7e Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Wed, 30 Jan 2008 23:39:23 -0200 Subject: [PATCH] Don't call xf86usleep, instead call usleep directly. Patch is conditional to XORG_VERSION_CURRENT > 10499002, i.e. --- src/magellan.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/magellan.h b/src/magellan.h index 88ac77e..2904bb4 100644 --- a/src/magellan.h +++ b/src/magellan.h @@ -29,6 +29,10 @@ #ifndef _MAGELLAN_H_ #define _MAGELLAN_H_ +#if XORG_VERSION_CURRENT > (((1) * 10000000) + ((4) * 100000) + ((99) * 1000) + 2) +#include +#endif + /****************************************************************************** * Definitions * structs, typedefs, #defines, enums @@ -68,7 +72,11 @@ MAGELLANState; #define MagellanNibble(Value) (Value&0x0F) +#if XORG_VERSION_CURRENT <= (((1) * 10000000) + ((4) * 100000) + ((99) * 1000) + 2) #define milisleep(ms) xf86usleep (ms * 1000) +#else +#define milisleep(ms) usleep (ms * 1000) +#endif typedef struct _MagellanPrivateRec { -- 1.5.3.2