aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog4
-rw-r--r--gcc/java/lang.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d1827cb..37dacc5 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-15 Neil Booth <neil@daikokuya.co.uk>
+
+ * lang.c (version_flag): Rename to v_flag to avoid clash w/ toplev.h.
+
2003-06-14 Neil Booth <neil@daikokuya.co.uk>
* lang-specs.h: Rewrite -MD and -MMD to append an underscore.
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index ab5b744..3ac6fd2 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -181,7 +181,7 @@ int flag_indirect_dispatch = 0;
int flag_store_check = 1;
/* When nonzero, print extra version information. */
-static int version_flag = 0;
+static int v_flag = 0;
/* Set nonzero if the user specified -finline-functions on the command
line. */
@@ -448,7 +448,7 @@ java_handle_option (size_t scode, const char *arg, int value)
break;
case OPT_version:
- version_flag = 1;
+ v_flag = 1;
break;
}
@@ -476,7 +476,7 @@ java_init (void)
&& force_align_functions_log < 1)
force_align_functions_log = 1;
- jcf_path_seal (version_flag);
+ jcf_path_seal (v_flag);
java_init_decl_processing ();