diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-25 23:16:59 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-25 23:16:59 +0000 |
| commit | 19b8f699d66e9163e1d6fba1e45a67e55e520e5c (patch) | |
| tree | 51a15c696f6c87c4d5d43f43625d4e3f588d09ef | |
| parent | 1028c3f905f6b590440f07317de0b2abeb52538a (diff) | |
xc/programs/Xserver/hw/xfree86/input/tek4957/xf86Tek4957.c Fix build errorsco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
in sparc-specific code when using non-C99 compiler like gcc 2.95 that
doesn't allow variable declarations in the middle of a code block.
xc/programs/xfs/difs/Imakefile Make sure VendorReleaseDefines is defined,
even if XOrgVersion isn't
| -rw-r--r-- | src/xf86Tek4957.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c index 96f5406..ef532db 100644 --- a/src/xf86Tek4957.c +++ b/src/xf86Tek4957.c @@ -1,3 +1,4 @@ +/* $XdotOrg:$ */ /* * 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 */ |