- Fixes for GCC on Linux.

SVN r202 (trunk)

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;

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;

tools/updaterevision/updaterevision.c

@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
 int main(int argc, char **argv)
 {