[Forensics-changes] [yara] 123/135: Fix issues with Bison 3.0

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.1.0
in repository yara.

commit a7c1dc2bb5ff273236063f744265f67000c8da68
Author: Victor Manuel Alvarez <vmalvarez at virustotal.com>
Date:   Sat Aug 23 23:39:57 2014 +0200

    Fix issues with Bison 3.0
---
 libyara/include/yara/hex_lexer.h | 3 ++-
 libyara/include/yara/re_lexer.h  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libyara/include/yara/hex_lexer.h b/libyara/include/yara/hex_lexer.h
index 64f9cfc..cca7ae1 100644
--- a/libyara/include/yara/hex_lexer.h
+++ b/libyara/include/yara/hex_lexer.h
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 #include <yara/re.h>
-#include <hex_grammar.h>
 
 #undef yyparse
 #undef yylex
@@ -64,6 +63,8 @@ typedef struct _HEX_LEX_ENVIRONMENT
 
 #define LEX_ENV  ((HEX_LEX_ENVIRONMENT*) lex_env)
 
+#include <hex_grammar.h>
+
 #define YY_DECL int hex_yylex \
     (YYSTYPE * yylval_param , yyscan_t yyscanner, HEX_LEX_ENVIRONMENT* lex_env)
 
diff --git a/libyara/include/yara/re_lexer.h b/libyara/include/yara/re_lexer.h
index 73c1f98..f8ce8f4 100644
--- a/libyara/include/yara/re_lexer.h
+++ b/libyara/include/yara/re_lexer.h
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <re_grammar.h>
-
 #undef yyparse
 #undef yylex
 #undef yyerror
@@ -65,6 +63,8 @@ typedef struct _RE_LEX_ENVIRONMENT
 
 #define YY_FATAL_ERROR(msg) re_yyfatal(yyscanner, msg)
 
+#include <re_grammar.h>
+
 #define YY_DECL int re_yylex \
     (YYSTYPE * yylval_param , yyscan_t yyscanner, RE_LEX_ENVIRONMENT* lex_env)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git