From: Tom Tromey <tromey@cygnus.com>
Date: Thu, 17 Dec 1998 12:50:02 +0000 (+0000)
Subject: parse-scan.y (report_main_declaration): Recognize `java.lang.String' in argument... 
X-Git-Tag: prereleases/libgcj-0.1~1591
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5ff227d1839465b9b0e52317bdd2a4af252b09c;p=thirdparty%2Fgcc.git

parse-scan.y (report_main_declaration): Recognize `java.lang.String' in argument to main.

	* parse-scan.y (report_main_declaration): Recognize
	`java.lang.String' in argument to main.

From-SVN: r24361
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 72e1535e9bb5..33a15f0ca56b 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-17  Tom Tromey  <tromey@cygnus.com>
+
+	* parse-scan.y (report_main_declaration): Recognize
+	`java.lang.String' in argument to main.
+
 Wed Dec 16 16:18:59 1998  Per Bothner  <bothner@cygnus.com>
 
 	* parse.y (create_interface):  Remove bogus test.
diff --git a/gcc/java/parse-scan.c b/gcc/java/parse-scan.c
index eff775229698..84ba60d76b79 100644
--- a/gcc/java/parse-scan.c
+++ b/gcc/java/parse-scan.c
@@ -2368,7 +2368,8 @@ report_main_declaration (declarator)
       && !strcmp (declarator->method_name, "main") 
       && declarator->args 
       && declarator->args [0] == '[' 
-      && !strcmp( declarator->args+1, "String")
+      && (! strcmp (declarator->args+1, "String")
+	  || ! strcmp (declarator->args + 1, "java.lang.String"))
       && current_class)
     {
       if (!previous_output)
diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y
index a5859c454f5d..022393493c25 100644
--- a/gcc/java/parse-scan.y
+++ b/gcc/java/parse-scan.y
@@ -1126,7 +1126,8 @@ report_main_declaration (declarator)
       && !strcmp (declarator->method_name, "main") 
       && declarator->args 
       && declarator->args [0] == '[' 
-      && !strcmp( declarator->args+1, "String")
+      && (! strcmp (declarator->args+1, "String")
+	  || ! strcmp (declarator->args + 1, "java.lang.String"))
       && current_class)
     {
       if (!previous_output)