Mercurial > hg > minc-tools
changeset 2155:2a8d05be6351
Minor fix to ncgenyy.l in progs/mincgen to avoid compiler problem on ia64
| author | bert <bert> |
|---|---|
| date | Wed, 22 Jun 2005 21:02:11 +0000 |
| parents | afb9e8b9db74 |
| children | 2a49819d3d03 |
| files | ChangeLog progs/mincgen/ncgenyy.l |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ MINC 2: +2005-06-22 Bert Vincent <bert@bic.mni.mcgill.ca> + * Minor fix to ncgenyy.l to avoid compiler complaint on ia64. + 2005-05-20 Bert Vincent <bert@bic.mni.mcgill.ca> * Update Makefile.msvc-win32 to build converters.
--- a/progs/mincgen/ncgenyy.l +++ b/progs/mincgen/ncgenyy.l @@ -2,7 +2,7 @@ /********************************************************************* * Copyright 1993, UCAR/Unidata * See netcdf/COPYRIGHT file for copying and redistribution conditions. - * $Id: ncgenyy.l,v 1.2 2005-05-20 17:59:01 bert Exp $ + * $Id: ncgenyy.l,v 1.3 2005-06-22 21:02:11 bert Exp $ *********************************************************************/ /* lex specification for tokens for ncgen */ @@ -24,7 +24,7 @@ extern int int_val; extern float float_val; -#ifndef YYSTYPE +#if !defined (YYSTYPE) && !defined(YYSTYPE_IS_DECLARED) extern void * yylval; #define YYLVAL_NULL ((void *) NULL) #else