Merge tag 'v2.6.4' into upstream

version 2.6.4

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/tests/lineno_r.l b/tests/lineno_r.l
index e6207c6..d7230d7 100644
--- a/tests/lineno_r.l
+++ b/tests/lineno_r.l
@@ -78,9 +78,7 @@ count_newlines (FILE* in)
 int main ( int argc, char** argv );
 
 int
-main (argc, argv)
-    int argc;
-    char ** argv;
+main (int argc, char **argv)
 {
     (void)argv;
 
@@ -89,11 +87,11 @@ main (argc, argv)
 
     else{
         yyscan_t s;
-        yylex_init(&s);
-        yyset_in(stdin,s);
-        yyset_out(stdout,s);
-        yylex(s);
-        yylex_destroy(s);
+        testlex_init(&s);
+        testset_in(stdin,s);
+        testset_out(stdout,s);
+        testlex(s);
+        testlex_destroy(s);
     }
     return 0;
 }