5 files changed, 5 insertions, 134 deletions
diff --git a/libjava/gnu/java/nio/ChannelInputStream.h b/libjava/gnu/java/nio/ChannelInputStream.h
index bc43e23da5a..04b624440f7 100644
--- a/libjava/gnu/java/nio/ChannelInputStream.h
+++ b/libjava/gnu/java/nio/ChannelInputStream.h
@@ -7,6 +7,8 @@
 #pragma interface
 
 #include <java/io/InputStream.h>
+#include <gcj/array.h>
+
 extern "Java"
 {
   namespace gnu
@@ -36,6 +38,7 @@ class gnu::java::nio::ChannelInputStream : public ::java::io::InputStream
 
 public:
   ChannelInputStream(::java::nio::channels::ReadableByteChannel *);
+  jint read(JArray< jbyte > *, jint, jint);
   jint read();
 private:
   ::java::nio::channels::ReadableByteChannel * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) ch;
diff --git a/libjava/gnu/java/nio/EpollSelectionKeyImpl.h b/libjava/gnu/java/nio/EpollSelectionKeyImpl.h
deleted file mode 100644
index 1674815153c..00000000000
--- a/libjava/gnu/java/nio/EpollSelectionKeyImpl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_EpollSelectionKeyImpl__
-#define __gnu_java_nio_EpollSelectionKeyImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectionKey.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class EpollSelectionKeyImpl;
-          class EpollSelectorImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::EpollSelectionKeyImpl : public ::java::nio::channels::spi::AbstractSelectionKey
-{
-
-public: // actually package-private
-  EpollSelectionKeyImpl(::gnu::java::nio::EpollSelectorImpl *, ::java::nio::channels::SelectableChannel *, jint);
-public:
-  virtual ::java::nio::channels::SelectableChannel * channel();
-  virtual jint interestOps();
-  virtual ::java::nio::channels::SelectionKey * interestOps(jint);
-  virtual jint readyOps();
-  virtual ::java::nio::channels::Selector * selector();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::spi::AbstractSelectionKey)))) fd;
-private:
-  ::gnu::java::nio::EpollSelectorImpl * selector__;
-  ::java::nio::channels::SelectableChannel * channel__;
-public: // actually package-private
-  jint interestOps__;
-  jint selectedOps;
-  jint key;
-  jboolean valid;
-  jboolean cancelled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_EpollSelectionKeyImpl__
diff --git a/libjava/gnu/java/nio/KqueueSelectionKeyImpl.h b/libjava/gnu/java/nio/KqueueSelectionKeyImpl.h
deleted file mode 100644
index 8a501b545cd..00000000000
--- a/libjava/gnu/java/nio/KqueueSelectionKeyImpl.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_KqueueSelectionKeyImpl__
-#define __gnu_java_nio_KqueueSelectionKeyImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectionKey.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class KqueueSelectionKeyImpl;
-          class KqueueSelectorImpl;
-          class VMChannelOwner;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::KqueueSelectionKeyImpl : public ::java::nio::channels::spi::AbstractSelectionKey
-{
-
-public:
-  KqueueSelectionKeyImpl(::gnu::java::nio::KqueueSelectorImpl *, ::java::nio::channels::SelectableChannel *);
-  virtual ::java::nio::channels::SelectableChannel * channel();
-  virtual jint interestOps();
-  virtual ::java::nio::channels::SelectionKey * interestOps(jint);
-  virtual jint readyOps();
-  virtual ::java::nio::channels::Selector * selector();
-  virtual ::java::lang::String * toString();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  virtual jboolean isReadActive();
-  virtual jboolean isReadInterested();
-  virtual jboolean isWriteActive();
-  virtual jboolean isWriteInterested();
-  virtual jboolean needCommitRead();
-  virtual jboolean needCommitWrite();
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::spi::AbstractSelectionKey)))) interestOps__;
-  jint readyOps__;
-  jint activeOps;
-  jint key;
-  jint fd;
-private:
-  ::gnu::java::nio::KqueueSelectorImpl * selector__;
-  ::java::nio::channels::SelectableChannel * channel__;
-  ::gnu::java::nio::VMChannelOwner * natChannel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_KqueueSelectionKeyImpl__
diff --git a/libjava/gnu/java/nio/SelectorProviderImpl.java b/libjava/gnu/java/nio/SelectorProviderImpl.java
index 47521107e90..03da80e6949 100644
--- a/libjava/gnu/java/nio/SelectorProviderImpl.java
+++ b/libjava/gnu/java/nio/SelectorProviderImpl.java
@@ -80,4 +80,5 @@ public class SelectorProviderImpl extends SelectorProvider
   {
     return new SocketChannelImpl (this);
   }
+
 }
diff --git a/libjava/gnu/java/nio/charset/EncodingHelper.h b/libjava/gnu/java/nio/charset/EncodingHelper.h
index 89cf7f1fe4c..7fbd289683e 100644
--- a/libjava/gnu/java/nio/charset/EncodingHelper.h
+++ b/libjava/gnu/java/nio/charset/EncodingHelper.h
@@ -43,6 +43,7 @@ public:
   static ::java::lang::String * getOldCanonical(::java::lang::String *);
   static jboolean isISOLatin1(::java::lang::String *);
   static ::java::nio::charset::Charset * getCharset(::java::lang::String *);
+  static ::java::nio::charset::Charset * getDefaultCharset();
 private:
   static ::java::util::HashMap * canonicalNames;
 public: