Merge pull request #2578 from eisenhauer/FFSupstream

FFS upstream
ornladios · Jan 9, 2021 · 99d08e2 · 99d08e2
2 parents dd9b211 + f898207
commit 99d08e2
Show file tree

Hide file tree

Showing 3 changed files with 390 additions and 383 deletions.
diff --git a/thirdparty/ffs/ffs/cod/cod.y b/thirdparty/ffs/ffs/cod/cod.y
@@ -120,6 +120,8 @@ gen_anon()
 #define yyrestart cod_yyrestart
 #define yywrap cod_yywrap
 #define yyerror cod_yyerror
+#define yylineno cod_yylineno
+#define yy_flex_debug cod_yy_flex_debug
 #define yy_create_buffer cod_yy_create_buffer
 #define yy_delete_buffer cod_yy_delete_buffer
 #define yy_flush_buffer cod_yy_flush_buffer