[packages/doxygen.git] / flex2.6.patch

From cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Thu, 19 Nov 2015 12:00:54 +0100
Subject: [PATCH] Support flex-2.6.0

The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not
take YY_FLEX_MINOR_VERSION into account, which made them fail with
flex-2.6.0.
---
 src/code.l        | 2 +-
 src/commentscan.l | 4 ++--
 src/fortrancode.l | 2 +-
 src/pycode.l      | 2 +-
 src/vhdlcode.l    | 2 +-
 src/xmlcode.l     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/code.l b/src/code.l
index 332358010..25719af2f 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3700,7 +3700,7 @@ void codeFreeScanner()
 extern "C" { // some bogus code to keep the compiler happy
   void codeYYdummy() { yy_flex_realloc(0,0); } 
 }
-#elif YY_FLEX_SUBMINOR_VERSION<33
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
 #endif
 
diff --git a/src/commentscan.l b/src/commentscan.l
index cf892a067..26298576e 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1128,7 +1128,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
 					      // but we need to know the position in the input buffer where this 
 					      // rule matched.
 					      // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
 					      inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
 #else
 					      inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
@@ -1190,7 +1190,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
                                           g_memberGroupHeader.resize(0);
 					  parseMore=TRUE;
                                           needNewEntry = TRUE;
-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
 				          inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
 #else
 				          inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
diff --git a/src/fortrancode.l b/src/fortrancode.l
index fb91a8300..352912b71 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
 extern "C" { // some bogus code to keep the compiler happy
   void fortrancodeYYdummy() { yy_flex_realloc(0,0); } 
 }
-#elif YY_FLEX_SUBMINOR_VERSION<33
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
 #else
 extern "C" { // some bogus code to keep the compiler happy
diff --git a/src/pycode.l b/src/pycode.l
index 3c41a69ec..f58f7c139 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
 extern "C" { // some bogus code to keep the compiler happy
   void pycodeYYdummy() { yy_flex_realloc(0,0); } 
 }
-#elif YY_FLEX_SUBMINOR_VERSION<33
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
 #endif
 
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index 369ae4881..695704844 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
 extern "C" { // some bogus code to keep the compiler happy
   void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } 
 }
-#elif YY_FLEX_SUBMINOR_VERSION<33
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
 #endif
 
From 8c51120ad55b440b738ef0b96f8169d84a7ae88a Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <dimitri@stack.nl>
Date: Sun, 22 Nov 2015 13:58:59 +0100
Subject: [PATCH] Support flex-2.6.0

---
 src/code.l        | 4 ++--
 src/commentscan.l | 4 ++--
 src/fortrancode.l | 6 +++---
 src/pycode.l      | 2 +-
 src/vhdlcode.l    | 2 +-
 src/xmlcode.l     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/code.l b/src/code.l
index 25719af2f..f014924a0 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3700,7 +3700,7 @@ void codeFreeScanner()
 extern "C" { // some bogus code to keep the compiler happy
   void codeYYdummy() { yy_flex_realloc(0,0); } 
 }
-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
-#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
+#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
 #endif
 
diff --git a/src/commentscan.l b/src/commentscan.l
index 26298576e..ffed075b0 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1128,7 +1128,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
 					      // but we need to know the position in the input buffer where this 
 					      // rule matched.
 					      // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
-#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
 					      inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
 #else
 					      inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
@@ -1190,7 +1190,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
                                           g_memberGroupHeader.resize(0);
 					  parseMore=TRUE;
                                           needNewEntry = TRUE;
-#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
 				          inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
 #else
 				          inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
diff --git a/src/fortrancode.l b/src/fortrancode.l
index 352912b71..82e78c184 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -1302,11 +1302,11 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
   return;
 }
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
+#if !defined(YY_FLEX_SUBMINOR_VERSION)
 extern "C" { // some bogus code to keep the compiler happy
-  void fortrancodeYYdummy() { yy_flex_realloc(0,0); } 
+  void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
 }
-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
 #else
 extern "C" { // some bogus code to keep the compiler happy
diff --git a/src/pycode.l b/src/pycode.l
index f58f7c139..2b2a6684e 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
 extern "C" { // some bogus code to keep the compiler happy
   void pycodeYYdummy() { yy_flex_realloc(0,0); } 
 }
-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
 #endif
 
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index 695704844..e4ae0e7ff 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
 extern "C" { // some bogus code to keep the compiler happy
   void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } 
 }
-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
 #endif
 
--- doxygen-1.8.10/src/xmlcode.l.orig	2021-04-24 18:28:51.986367667 +0200
+++ doxygen-1.8.10/src/xmlcode.l	2021-04-24 18:28:55.833013495 +0200
@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
 extern "C" { // some bogus code to keep the compiler happy
   void xmlcodeYYdummy() { yy_flex_realloc(0,0); } 
 }
-#elif YY_FLEX_SUBMINOR_VERSION<33
+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
 #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
 #endif
Commit	Line	Data
be4455cb JP	1	From cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb Mon Sep 17 00:00:00 2001
	2	From: Heiko Becker <heirecka@exherbo.org>
	3	Date: Thu, 19 Nov 2015 12:00:54 +0100
	4	Subject: [PATCH] Support flex-2.6.0
	5
	6	The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not
	7	take YY_FLEX_MINOR_VERSION into account, which made them fail with
	8	flex-2.6.0.
	9	---
	10	src/code.l \| 2 +-
	11	src/commentscan.l \| 4 ++--
	12	src/fortrancode.l \| 2 +-
	13	src/pycode.l \| 2 +-
	14	src/vhdlcode.l \| 2 +-
	15	src/xmlcode.l \| 2 +-
	16	6 files changed, 7 insertions(+), 7 deletions(-)
	17
	18	diff --git a/src/code.l b/src/code.l
	19	index 332358010..25719af2f 100644
	20	--- a/src/code.l
	21	+++ b/src/code.l
	22	@@ -3700,7 +3700,7 @@ void codeFreeScanner()
	23	extern "C" { // some bogus code to keep the compiler happy
	24	void codeYYdummy() { yy_flex_realloc(0,0); }
	25	}
	26	-#elif YY_FLEX_SUBMINOR_VERSION<33
	27	+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
	28	#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
	29	#endif
	30
	31	diff --git a/src/commentscan.l b/src/commentscan.l
	32	index cf892a067..26298576e 100644
	33	--- a/src/commentscan.l
	34	+++ b/src/commentscan.l
	35	@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
	36	// but we need to know the position in the input buffer where this
	37	// rule matched.
	38	// for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
	39	-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
	40	+#if YY_FLEX_MINOR_VERSION>5 \|\| YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
	41	inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
	42	#else
	43	inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
	44	@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
	45	g_memberGroupHeader.resize(0);
	46	parseMore=TRUE;
	47	needNewEntry = TRUE;
	48	-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
	49	+#if YY_FLEX_MINOR_VERSION>5 \|\| YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
	50	inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
	51	#else
	52	inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
	53	diff --git a/src/fortrancode.l b/src/fortrancode.l
	54	index fb91a8300..352912b71 100644
	55	--- a/src/fortrancode.l
	56	+++ b/src/fortrancode.l
	57	@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
	58	extern "C" { // some bogus code to keep the compiler happy
	59	void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
	60	}
	61	-#elif YY_FLEX_SUBMINOR_VERSION<33
	62	+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
	63	#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
	64	#else
65	extern "C" { // some bogus code to keep the compiler happy
66	diff --git a/src/pycode.l b/src/pycode.l
67	index 3c41a69ec..f58f7c139 100644
68	--- a/src/pycode.l
69	+++ b/src/pycode.l
70	@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /className/,
71	extern "C" { // some bogus code to keep the compiler happy
72	void pycodeYYdummy() { yy_flex_realloc(0,0); }
73	}
74	-#elif YY_FLEX_SUBMINOR_VERSION<33
75	+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
76	#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
77	#endif
78
79	diff --git a/src/vhdlcode.l b/src/vhdlcode.l
80	index 369ae4881..695704844 100644
81	--- a/src/vhdlcode.l
82	+++ b/src/vhdlcode.l
83	@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
84	extern "C" { // some bogus code to keep the compiler happy
85	void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
86	}
87	-#elif YY_FLEX_SUBMINOR_VERSION<33
88	+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
89	#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
90	#endif
91
92	From 8c51120ad55b440b738ef0b96f8169d84a7ae88a Mon Sep 17 00:00:00 2001
93	From: Dimitri van Heesch <dimitri@stack.nl>
94	Date: Sun, 22 Nov 2015 13:58:59 +0100
95	Subject: [PATCH] Support flex-2.6.0
96
97	---
98	src/code.l \| 4 ++--
99	src/commentscan.l \| 4 ++--
100	src/fortrancode.l \| 6 +++---
101	src/pycode.l \| 2 +-
102	src/vhdlcode.l \| 2 +-
103	src/xmlcode.l \| 2 +-
104	6 files changed, 10 insertions(+), 10 deletions(-)
105
106	diff --git a/src/code.l b/src/code.l
107	index 25719af2f..f014924a0 100644
108	--- a/src/code.l
109	+++ b/src/code.l
110	@@ -3700,7 +3700,7 @@ void codeFreeScanner()
111	extern "C" { // some bogus code to keep the compiler happy
112	void codeYYdummy() { yy_flex_realloc(0,0); }
113	}
114	-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
115	-#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
116	+#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
117	+#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
118	#endif
119
120	diff --git a/src/commentscan.l b/src/commentscan.l
121	index 26298576e..ffed075b0 100644
122	--- a/src/commentscan.l
123	+++ b/src/commentscan.l
124	@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
125	// but we need to know the position in the input buffer where this
126	// rule matched.
127	// for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
128	-#if YY_FLEX_MINOR_VERSION>5 \|\| YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
129	+#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 \|\| (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
130	inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
131	#else
132	inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
133	@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
134	g_memberGroupHeader.resize(0);
135	parseMore=TRUE;
136	needNewEntry = TRUE;
137	-#if YY_FLEX_MINOR_VERSION>5 \|\| YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
138	+#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 \|\| (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
139	inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
140	#else
141	inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
142	diff --git a/src/fortrancode.l b/src/fortrancode.l
143	index 352912b71..82e78c184 100644
144	--- a/src/fortrancode.l
145	+++ b/src/fortrancode.l
146	@@ -1302,11 +1302,11 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
147	return;
148	}
149
150	-#if !defined(YY_FLEX_SUBMINOR_VERSION)
151	+#if !defined(YY_FLEX_SUBMINOR_VERSION)
152	extern "C" { // some bogus code to keep the compiler happy
153	- void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
154	+ void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
155	}
156	-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
157	+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
158	#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
159	#else
160	extern "C" { // some bogus code to keep the compiler happy
161	diff --git a/src/pycode.l b/src/pycode.l
162	index f58f7c139..2b2a6684e 100644
163	--- a/src/pycode.l
164	+++ b/src/pycode.l
165	@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /className/,
166	extern "C" { // some bogus code to keep the compiler happy
167	void pycodeYYdummy() { yy_flex_realloc(0,0); }
168	}
169	-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
170	+#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
171	#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
172	#endif
173
174	diff --git a/src/vhdlcode.l b/src/vhdlcode.l
175	index 695704844..e4ae0e7ff 100644
176	--- a/src/vhdlcode.l
177	+++ b/src/vhdlcode.l
178	@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
179	extern "C" { // some bogus code to keep the compiler happy
180	void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
181	}
182	-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
183	+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
184	#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
185	#endif
186
982ead96 JB	187	--- doxygen-1.8.10/src/xmlcode.l.orig 2021-04-24 18:28:51.986367667 +0200
	188	+++ doxygen-1.8.10/src/xmlcode.l 2021-04-24 18:28:55.833013495 +0200
	189	@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
	190	extern "C" { // some bogus code to keep the compiler happy
	191	void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
	192	}
	193	-#elif YY_FLEX_SUBMINOR_VERSION<33
	194	+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
	195	#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
	196	#endif
	197