Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741

2 files changed, 33 insertions, 0 deletions

diff --git a/libjava/java/security/KeyStore$1.h b/libjava/java/security/KeyStore$1.h
new file mode 100644
index 00000000000..335569c08b8
--- /dev/null
+++ b/libjava/java/security/KeyStore$1.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_security_KeyStore$1__
+#define __java_security_KeyStore$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class KeyStore$1;
+    }
+  }
+}
+
+class java::security::KeyStore$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  KeyStore$1();
+public:
+  virtual ::java::lang::String * KeyStore$1$run();
+  virtual ::java::lang::Object * run();
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_security_KeyStore$1__
diff --git a/libjava/java/security/ProtectionDomain.h b/libjava/java/security/ProtectionDomain.h
index 7f204667a85..bb2430be166 100644
--- a/libjava/java/security/ProtectionDomain.h
+++ b/libjava/java/security/ProtectionDomain.h
@@ -45,6 +45,7 @@ private:
   ::java::lang::ClassLoader * classloader;
   JArray< ::java::security::Principal * > * principals;
   jboolean staticBinding;
+  jboolean hasAllPermissions;
 public:
   static ::java::lang::Class class$;
 };