* gij.cc (main): Formatting fixes.

	(_Jv_Compiler_Properties): Define.
	* java/lang/natSystem.cc (_Jv_Environment_Properties): Don't
	declare.
	(init_properties): Set properites from _Jv_Compiler_Properties.
	* include/java-props.h (_Jv_Compiler_Properties,
	_Jv_Environment_Properties): Declare.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30020 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 3 deletions

diff --git a/libjava/gij.cc b/libjava/gij.cc
index ffe1515037d..b851b77dcd8 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -15,13 +15,20 @@ details.  */
 #include <java/lang/System.h>
 #include <java/util/Properties.h>
 
-int main (int argc, const char **argv)
+// This is used to initialize the compiled-in system properties.
+const char *_Jv_Compiler_Properties[] =
+{
+  NULL
+};
+
+int
+main (int argc, const char **argv)
 {
   if (argc < 2)
     {
-      printf ("usage: %s <class name> args\n", argv[0]);
+      printf ("usage: %s CLASS [ARGS]...\n", argv[0]);
       exit (1);
     }
 
-  _Jv_RunMain (argv[1], argc-1, argv+1);
+  _Jv_RunMain (argv[1], argc - 1, argv + 1);
 }