From 81795b8406c8744a186c1de5fa1a5356aa0f2d49 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Wed, 30 Jan 2008 23:28:48 -0200 Subject: [PATCH] Don't call xf86GetErrno, instead use errno directly. Patch is conditional to XORG_VERSION_CURRENT > 10499002, i.e. tag xorg-server-1.4.0.90. --- src/elo.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/elo.c b/src/elo.c index d7b1003..1ab1b28 100644 --- a/src/elo.c +++ b/src/elo.c @@ -54,6 +54,10 @@ #include "config.h" #endif +#if XORG_VERSION_CURRENT > (((1) * 10000000) + ((4) * 100000) + ((99) * 1000) + 2) +#include +#endif + #define _elo_C_ /***************************************************************************** * Standard Headers @@ -159,7 +163,11 @@ SetupProc( pointer module, { xf86ErrorF ("ELO 2300 driver unable to open device\n"); *errmaj = LDR_NOPORTOPEN; +#if XORG_VERSION_CURRENT <= (((1) * 10000000) + ((4) * 100000) + ((99) * 1000) + 2) *errmin = xf86GetErrno (); +#else + *errmin = errno; +#endif goto SetupProc_fail; } xf86ErrorFVerb( 6, "tty port opened successfully\n" ); -- 1.5.3.2