# HG changeset patch
# User bert <bert>
# Date 1119474131 0
# Node ID 2a8d05be635183994eca8696d6d5bede89c1653d
# Parent  afb9e8b9db74b5d4ad2210d17f8508c10cb4143e
Minor fix to ncgenyy.l in progs/mincgen to avoid compiler problem on ia64

diff --git a/ChangeLog b/ChangeLog
--- 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.
diff --git a/progs/mincgen/ncgenyy.l b/progs/mincgen/ncgenyy.l
--- 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