Yet another bunch of forgotten filestree-ssa-cfg-branch

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tree-ssa-cfg-branch@72683 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 10 insertions, 22 deletions

diff --git a/libjava/gnu/gcj/protocol/gcjlib/Connection.java b/libjava/gnu/gcj/protocol/gcjlib/Connection.java
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/libjava/gnu/gcj/protocol/gcjlib/Connection.java
diff --git a/libjava/gnu/gcj/protocol/gcjlib/Handler.java b/libjava/gnu/gcj/protocol/gcjlib/Handler.java
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/libjava/gnu/gcj/protocol/gcjlib/Handler.java
diff --git a/libjava/gnu/java/net/PlainDatagramSocketImpl.java b/libjava/gnu/java/net/PlainDatagramSocketImpl.java
index bc868644e40..a0785dbc303 100644
--- a/libjava/gnu/java/net/PlainDatagramSocketImpl.java
+++ b/libjava/gnu/java/net/PlainDatagramSocketImpl.java
@@ -112,21 +112,6 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
   {
   }
 
-  protected void finalize() throws Throwable
-  {
-    synchronized (this)
-      {
-	if (fnum != -1)
-	  close();
-      }
-    super.finalize();
-  }
-
-  public int getNativeFD()
-  {
-    return fnum;
-  }
-
   /**
    * Binds this socket to a particular port and interface
    *
@@ -282,4 +267,14 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
   {
     mcastGrp(((InetSocketAddress)mcastaddr).getAddress(), netIf, false);
   }
+
+  protected void finalize() throws Throwable
+  {
+    synchronized (this)
+      {
+	if (fnum != -1)
+	  close();
+      }
+    super.finalize();
+  }
 }
diff --git a/libjava/gnu/java/net/PlainSocketImpl.java b/libjava/gnu/java/net/PlainSocketImpl.java
index 01ba28851d7..3edb9745bed 100644
--- a/libjava/gnu/java/net/PlainSocketImpl.java
+++ b/libjava/gnu/java/net/PlainSocketImpl.java
@@ -142,11 +142,6 @@ public final class PlainSocketImpl extends SocketImpl
     super.finalize();
   }
 
-  public int getNativeFD()
-  {
-    return fnum;
-  }
-
   /**
    * Sets the specified option on a socket to the passed in object.  For
    * options that take an integer argument, the passed in object is an
diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
index 57607e85696..fc93e5713c7 100644
--- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc
+++ b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
@@ -14,8 +14,6 @@ details.  */
 #undef MIN_PRIORITY
 
 #include <gnu/java/net/PlainSocketImpl.h>
-#include <gnu/java/net/PlainSocketImpl$SocketInputStream.h>
-#include <gnu/java/net/PlainSocketImpl$SocketOutputStream.h>
 #include <java/io/IOException.h>
 #include <java/io/InterruptedIOException.h>
 #include <java/net/BindException.h>