diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:07 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:07 +0000 |
| commit | cb9e8cb202affcc3c4de54f15d8ca6eef80ee1a0 (patch) | |
| tree | 236cedb00d415482109267084d900d15a15ca42d | |
| parent | cfbb86d9f97328685b1d349e51f19c8de992e865 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
| -rw-r--r-- | src/xf86Tek4957.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c index 41ef830..47127c6 100644 --- a/src/xf86Tek4957.c +++ b/src/xf86Tek4957.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/tek4957/xf86Tek4957.c,v 1.3 2004/04/25 23:16:59 alanc Exp $ */ /* * Copyright 2002 by Olivier DANET <odanet@caramail.com> * @@ -21,7 +22,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/tek4957/xf86Tek4957.c,v 1.1 2002/11/11 01:18:08 alanh Exp $ */ #ifndef XFree86LOADER #include <unistd.h> @@ -589,16 +590,16 @@ TekInit(InputDriverPtr drv, local->old_y = -1; #if defined (sun) && !defined(i386) - char *dev_name; -#endif - -#if defined(sun) && !defined(i386) - if ((dev_name = getenv("TEK4957_DEV"))) { - priv->Device = xalloc(strlen(dev_name) + 1); - strcpy(priv->Device, dev_name); - xf86Msg(X_INFO,"Tek4957:Port selected : %s\n", priv->Device); - } else { - priv->Device = ""; + { + char *dev_name; + + if ((dev_name = getenv("TEK4957_DEV"))) { + priv->Device = xalloc(strlen(dev_name) + 1); + strcpy(priv->Device, dev_name); + xf86Msg(X_INFO,"Tek4957:Port selected : %s\n", priv->Device); + } else { + priv->Device = ""; + } } #else priv->Device = ""; /* device file name */ @@ -758,7 +759,7 @@ static XF86ModuleVersionInfo TekVersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, |