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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 519b2aa..ecc8e50 100644 (file)
--- 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 ded6a70..4a15cf1 100644 (file)
--- 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