Pull request #4351: Prerequisites for FlexLexer includes

Merge in SNORT/snort3 from ~OSHUMEIK/snort3:jsn_flex_naming to master

Squashed commit of the following:

commit 307587f13d592061cfd1bc38f36ab2e9cf5ce73c
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Mon Jun 17 15:11:42 2024 +0300

    js_norm: fix prerequisites for FlexLexer includes

diff --git a/src/js_norm/js_normalizer.h b/src/js_norm/js_normalizer.h
index 911d255ac16f38721c6fe70c1c2759dd84ed1d6e..461e007d2297789840a339ba881bd7c82f023c9b 100644 (file)
--- a/src/js_norm/js_normalizer.h
+++ b/src/js_norm/js_normalizer.h
@@ -22,6 +22,9 @@
 
 #include "main/snort_types.h"
 
+// This follows the prefix from js_tokenizer.l
+#undef yyFlexLexer
+#define yyFlexLexer jsFlexLexer
 #include <FlexLexer.h>
 
 #include "helpers/streambuf.h"

diff --git a/src/js_norm/js_pdf_norm.h b/src/js_norm/js_pdf_norm.h
index edc54fadffa84b866eaef1132aec8beab1be972b..68cdbe5c2e661138742d9118e6e99baacb38043a 100644 (file)
--- a/src/js_norm/js_pdf_norm.h
+++ b/src/js_norm/js_pdf_norm.h
@@ -20,9 +20,13 @@
 #ifndef JS_PDF_NORM_H
 #define JS_PDF_NORM_H
 
-#include <FlexLexer.h>
 #include <cstring>
 
+// This follows the prefix from pdf_tokenizer.l
+#undef yyFlexLexer
+#define yyFlexLexer pdfFlexLexer
+#include <FlexLexer.h>
+
 #include "helpers/streambuf.h"
 #include "js_norm/js_norm.h"
 #include "js_norm/pdf_tokenizer.h"