Package: openfoam / 4.0+dfsg1-7~bpo8+1

20_yyflex-fix.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
Description: Fix linkage with yyflex
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2016-09-17

--- openfoam-4.0.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ openfoam-4.0/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;
 }
--- openfoam-4.0.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ openfoam-4.0/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;
 }
--- openfoam-4.0.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ openfoam-4.0/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;
 }
--- openfoam-4.0.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ openfoam-4.0/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;
 }
--- openfoam-4.0.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+++ openfoam-4.0/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;
 }
--- openfoam-4.0.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ openfoam-4.0/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;
 }
--- openfoam-4.0.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ openfoam-4.0/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;
 }