aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@waitaki.otago.ac.nz>2002-04-17 08:23:00 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2002-04-17 09:23:00 +0100
commit3020a7f5a4a2dbce2ddd1279700337ed45f20380 (patch)
tree050ab7bc2cb9bc57f04f988ac53c094b526cce68 /gcc/java
parent8f8d72013dbf55fc8d8fc1581ffafb5d95bbdff3 (diff)
downloadgcc-3020a7f5a4a2dbce2ddd1279700337ed45f20380.zip
gcc-3020a7f5a4a2dbce2ddd1279700337ed45f20380.tar.gz
gcc-3020a7f5a4a2dbce2ddd1279700337ed45f20380.tar.bz2
re PR java/6294 (private inner interface is flagged illegal)
Fix for PR java/6294: * parse.h (INNER_INTERFACE_MODIFIERS): Allow ACC_PRIVATE for inner interfaces. From-SVN: r52411
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog7
-rw-r--r--gcc/java/parse.h3
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 519b2aa..ecc8e50 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-16 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
+
+ Fix for PR java/6294:
+ * parse.h (INNER_INTERFACE_MODIFIERS): Allow ACC_PRIVATE for inner
+ interfaces.
+
2002-04-15 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
Fix for PR java/6085:
@@ -33,7 +39,6 @@
* Make-lang.in: Compile jcf-path with version info for use in
identifying the appropriate libgcj.jar.
->>>>>>> 1.982
2002-04-08 Tom Tromey <tromey@redhat.com>
For PR libgcj/5303:
diff --git a/gcc/java/parse.h b/gcc/java/parse.h
index ded6a7000..4a15cf1 100644
--- a/gcc/java/parse.h
+++ b/gcc/java/parse.h
@@ -80,7 +80,8 @@ extern tree stabilize_reference PARAMS ((tree));
ACC_STATIC|ACC_FINAL|ACC_SYNCHRONIZED|ACC_NATIVE| \
ACC_STRICT
#define INTERFACE_MODIFIERS ACC_PUBLIC|ACC_ABSTRACT|ACC_STRICT
-#define INTERFACE_INNER_MODIFIERS ACC_PUBLIC|ACC_PROTECTED|ACC_ABSTRACT|ACC_STATIC
+#define INTERFACE_INNER_MODIFIERS ACC_PUBLIC|ACC_PROTECTED|ACC_ABSTRACT| \
+ ACC_STATIC|ACC_PRIVATE
#define INTERFACE_METHOD_MODIFIERS ACC_PUBLIC|ACC_ABSTRACT
#define INTERFACE_FIELD_MODIFIERS ACC_PUBLIC|ACC_STATIC|ACC_FINAL