Description: Fix linkage with yyflex
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2016-09-17

Index: OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
===================================================================
--- OpenFOAM-4.x-version-4.1.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -77,11 +77,7 @@ label currentTypei = -1;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
-extern "C" int yywrap()
-#else
 int yyFlexLexer::yywrap()
-#endif
 {
     return 1;
 }
Index: OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
===================================================================
--- OpenFOAM-4.x-version-4.1.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -123,11 +123,7 @@ void uniquify(word& name, HashSet<word>&
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
-extern "C" int yywrap()
-#else
 int yyFlexLexer::yywrap()
-#endif
 {
     return 1;
 }
Index: OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
===================================================================
--- OpenFOAM-4.x-version-4.1.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -100,11 +100,7 @@ wordList patchNameIDs(maxZoneID);
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
-extern "C" int yywrap()
-#else
 int yyFlexLexer::yywrap()
-#endif
 {
     return 1;
 }
Index: OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
===================================================================
--- OpenFOAM-4.x-version-4.1.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -80,11 +80,7 @@ label nValuesForPatchFaces = 0;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
-extern "C" int yywrap()
-#else
 int yyFlexLexer::yywrap()
-#endif
 {
     return 1;
 }
Index: OpenFOAM-4.x-version-4.1/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
===================================================================
--- OpenFOAM-4.x-version-4.1.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+++ OpenFOAM-4.x-version-4.1/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
@@ -50,11 +50,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! \cond dummy
-#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
-extern "C" int yywrap()
-#else
 int yyFlexLexer::yywrap()
-#endif
 {
     return 1;
 }
Index: OpenFOAM-4.x-version-4.1/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
===================================================================
--- OpenFOAM-4.x-version-4.1.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ OpenFOAM-4.x-version-4.1/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -54,11 +54,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! \cond dummy
-#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
-extern "C" int yywrap()
-#else
 int yyFlexLexer::yywrap()
-#endif
 {
     return 1;
 }
Index: OpenFOAM-4.x-version-4.1/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
===================================================================
--- OpenFOAM-4.x-version-4.1.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ OpenFOAM-4.x-version-4.1/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -55,11 +55,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! \cond dummy
-#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
-extern "C" int yywrap()
-#else
 int yyFlexLexer::yywrap()
-#endif
 {
     return 1;
 }