From 0b75068901014374b3aa55367541b3be56ccc815 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 17 Jun 2014 09:50:49 -0500 Subject: [svn-r25302] Add nounistd option to flex command for windows caompatibility --- bin/genltanalyze | 2 +- hl/c++/src/Makefile.in | 2 +- hl/fortran/src/Makefile.in | 2 +- hl/src/H5LTanalyze.c | 12 ++---------- hl/src/Makefile.in | 2 +- src/Makefile.in | 2 +- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/bin/genltanalyze b/bin/genltanalyze index b65b3e7..8bb0423 100755 --- a/bin/genltanalyze +++ b/bin/genltanalyze @@ -48,7 +48,7 @@ cd hl/src echo "Generate hl/src/H5LTparse.c from hl/src/H5LTparse.y" bison -pH5LTyy -o H5LTparse.c -d H5LTparse.y echo "Generate hl/src/H5LTanalyze.c from hl/src/H5LTanalyze.l" -flex -PH5LTyy -oH5LTanalyze.c H5LTanalyze.l +flex --nounistd -PH5LTyy -oH5LTanalyze.c H5LTanalyze.l cd ../.. exit 0 diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index c68426d..a0b19aa 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -674,7 +674,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 175 +LT_VERS_REVISION = 174 LT_VERS_AGE = 0 # This is our main target diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 984fd17..0431cef 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -689,7 +689,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 175 +LT_VERS_REVISION = 174 LT_VERS_AGE = 0 # Our main target, the high-level fortran library diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c index ece9860..6a151d6 100644 --- a/hl/src/H5LTanalyze.c +++ b/hl/src/H5LTanalyze.c @@ -917,14 +917,6 @@ hbool_t first_quote = 1; #define INITIAL 0 #define TAG_STRING 1 -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - #ifndef YY_EXTRA_TYPE #define YY_EXTRA_TYPE void * #endif @@ -1098,7 +1090,7 @@ YY_DECL #line 72 "H5LTanalyze.l" -#line 1102 "H5LTanalyze.c" +#line 1094 "H5LTanalyze.c" if ( !(yy_init) ) { @@ -1548,7 +1540,7 @@ YY_RULE_SETUP #line 174 "H5LTanalyze.l" ECHO; YY_BREAK -#line 1552 "H5LTanalyze.c" +#line 1544 "H5LTanalyze.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(TAG_STRING): yyterminate(); diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index beb0e85..dc575e1 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -670,7 +670,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 175 +LT_VERS_REVISION = 174 LT_VERS_AGE = 0 # This library is our main target. diff --git a/src/Makefile.in b/src/Makefile.in index 926a26d..f8d5f36 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -732,7 +732,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 175 +LT_VERS_REVISION = 174 LT_VERS_AGE = 0 # Our main target, the HDF5 library -- cgit v0.12