javaprims.h: Updated.

	* gcj/javaprims.h: Updated.
	* scripts/classes.pl (scan): Removed stray semicolon.

From-SVN: r60659

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9c2bd53281613c6f9311f40d2f494348c94297b3..ae32ff1e4baa54795aee0fd9c599bf75bd633583 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-29  Tom Tromey  <tromey@redhat.com>
+
+       * gcj/javaprims.h: Updated.
+       * scripts/classes.pl (scan): Removed stray semicolon.
+
 2002-12-30  Mark Wielaard  <mark@klomp.org>
 
        * java/net/URLStreamHandler.java (toExternalForm): Ignore port

diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h
index c6e4a00ae39ee1f33d0a5c837fff4bcaf8ef0f57..99b2fc1b153554bea5f773ea23c3e15cc6ab6a26 100644 (file)
--- a/libjava/gcj/javaprims.h
+++ b/libjava/gcj/javaprims.h
@@ -230,16 +230,18 @@ extern "Java"
         class Array;
         class Constructor;
         class Field;
-       class InvocationHandler;
+        class InvocationHandler;
         class InvocationTargetException;
         class Member;
         class Method;
         class Modifier;
-       class Proxy;
-       class Proxy$ProxyData;
-       class Proxy$ProxyType;
+        class Proxy;
+        class Proxy$ClassFactory;
+        class Proxy$ProxyData;
+        class Proxy$ProxySignature;
+        class Proxy$ProxyType;
         class ReflectPermission;
-       class UndeclaredThrowableException;
+        class UndeclaredThrowableException;
       }
     }
 
@@ -334,7 +336,6 @@ extern "Java"
       class RandomAccess;
       class RandomAccessSubList;
       class ResourceBundle;
-      class ResourceBundle$Security;
       class Set;
       class SimpleTimeZone;
       class SortedMap;
@@ -371,6 +372,13 @@ extern "Java"
         class Manifest;
       }
 
+      namespace regex
+      {
+        class Matcher;
+        class Pattern;
+        class PatternSyntaxException;
+      }
+
       namespace zip
       {
         class Adler32;

diff --git a/libjava/scripts/classes.pl b/libjava/scripts/classes.pl
index cc5ef7866683cfbe85fdf93ef76145bbe3308a6f..7e77c59227ef05bbd144609fd5f269aecc2ef687 100644 (file)
--- a/libjava/scripts/classes.pl
+++ b/libjava/scripts/classes.pl
@@ -1,7 +1,7 @@
 # classes.pl - A perl program to generate most of the contents of
 # javaprims.h automatically.
 
-# Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
+# Copyright (C) 1998, 1999, 2000, 2002  Red Hat, Inc.
 #
 # This file is part of libjava.
 #
@@ -119,5 +119,5 @@ sub scan
        &scan ("$dir/$_", $indent + 2);
     }
 
-    print $spaces, "};\n";
+    print $spaces, "}\n";
 }