From c32afb8b4c3e3e60daac41b19302aa13f72b8e18 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 20 Jun 2006 22:26:04 +0000 Subject: [PATCH] - Fixes for GCC on Linux. SVN r202 (trunk) --- src/sc_man_scanner.h | 10 +++++----- src/sc_man_scanner.re | 10 +++++----- tools/updaterevision/updaterevision.c | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/sc_man_scanner.h b/src/sc_man_scanner.h index 09be13e17..d245d2efe 100644 --- a/src/sc_man_scanner.h +++ b/src/sc_man_scanner.h @@ -15,7 +15,7 @@ char *cursor = ScriptPtr; char *limit = ScriptEndPtr; -std: +std1: tok = YYCURSOR; std2: #line 33 "src/sc_man_scanner.re" @@ -70,7 +70,7 @@ yy6: goto yy23; yy7: #line 40 "src/sc_man_scanner.re" - { goto std; } + { goto std1; } #line 75 "src/sc_man_scanner.h" yy8: ++YYCURSOR; @@ -260,7 +260,7 @@ yy34: goto yy72; yy35: #line 58 "src/sc_man_scanner.re" - { goto std; } + { goto std1; } #line 265 "src/sc_man_scanner.h" yy36: ++YYCURSOR; @@ -509,7 +509,7 @@ yy85: yy86: ++YYCURSOR; #line 97 "src/sc_man_scanner.re" - { goto std; } + { goto std1; } #line 514 "src/sc_man_scanner.h" } #line 110 "src/sc_man_scanner.re" @@ -523,7 +523,7 @@ newline: } sc_Line++; sc_Crossed = true; - goto std; + goto std1; normal_token: ScriptPtr = (YYCURSOR >= YYLIMIT) ? ScriptEndPtr : cursor; diff --git a/src/sc_man_scanner.re b/src/sc_man_scanner.re index 165500cf4..c85a2c3d4 100644 --- a/src/sc_man_scanner.re +++ b/src/sc_man_scanner.re @@ -13,7 +13,7 @@ char *cursor = ScriptPtr; char *limit = ScriptEndPtr; -std: +std1: tok = YYCURSOR; std2: /*!re2c @@ -37,7 +37,7 @@ std2: "/*" { goto comment; } /* C comment */ ("//"|";") (any\"\n")* "\n" { goto newline; } /* C++/Hexen comment */ - WSP+ { goto std; } /* whitespace */ + WSP+ { goto std1; } /* whitespace */ "\n" { goto newline; } "\"" { goto string; } @@ -55,7 +55,7 @@ std2: "/*" { goto comment; } /* C comment */ "//" (any\"\n")* "\n" { goto newline; } /* C++ comment */ - WSP+ { goto std; } /* whitespace */ + WSP+ { goto std1; } /* whitespace */ "\n" { goto newline; } "\"" { goto string; } @@ -94,7 +94,7 @@ negative_check: comment: /*!re2c - "*/" { goto std; } + "*/" { goto std1; } "\n" { if (YYCURSOR >= YYLIMIT) @@ -117,7 +117,7 @@ newline: } sc_Line++; sc_Crossed = true; - goto std; + goto std1; normal_token: ScriptPtr = (YYCURSOR >= YYLIMIT) ? ScriptEndPtr : cursor; diff --git a/tools/updaterevision/updaterevision.c b/tools/updaterevision/updaterevision.c index 025d5679a..d601c26ef 100644 --- a/tools/updaterevision/updaterevision.c +++ b/tools/updaterevision/updaterevision.c @@ -11,6 +11,7 @@ #include #include #include +#include int main(int argc, char **argv) {