natInetAddressWin32.cc, [...]: Removed code enclosed in DISABLE_JAVA_NET defines.

2003-08-29  Michael Koch  <konqueror@gmx.de>

	* java/net/natInetAddressWin32.cc,
	java/net/natNetworkInterfaceWin32.cc,
	java/net/natPlainDatagramSocketImplWin32.cc,
	java/net/natPlainSocketImplWin32.cc:
	Removed code enclosed in DISABLE_JAVA_NET defines.

From-SVN: r70883

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ba60c8267a40c2efee5d453920a09654672e6e7a..c9e8984d89e31e46afb907c79639a615832d3653 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-29  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/natInetAddressWin32.cc,
+       java/net/natNetworkInterfaceWin32.cc,
+       java/net/natPlainDatagramSocketImplWin32.cc,
+       java/net/natPlainSocketImplWin32.cc:
+       Removed code enclosed in DISABLE_JAVA_NET defines.
+
 2003-08-26  Mohan Embar  <gnustuff@thisiscool.com>
 
        * Makefile.am: (write_entries_to_file) New parameterized

diff --git a/libjava/java/net/natInetAddressWin32.cc b/libjava/java/net/natInetAddressWin32.cc
index f6748fd56916cc8a8c50642cceecdf5925c49d64..a0a8c676a6ee58ffb5956e3ccc9b98a356d40e38 100644 (file)
--- a/libjava/java/net/natInetAddressWin32.cc
+++ b/libjava/java/net/natInetAddressWin32.cc
@@ -57,34 +57,6 @@ details.  */
 extern "C" int gethostname (char *name, int namelen);
 #endif
 
-#ifdef DISABLE_JAVA_NET
-
-jbyteArray
-java::net::InetAddress::aton (jstring)
-{
-  return NULL;
-}
-
-jint
-java::net::InetAddress::getFamily (jbyteArray bytes)
-{
-  return 0;
-}
-
-JArray<java::net::InetAddress*> *
-java::net::InetAddress::lookup (jstring, java::net::InetAddress *, jboolean)
-{
-  return NULL;
-}
-
-jstring
-java::net::InetAddress::getLocalHostname ()
-{
-  return NULL;
-}
-
-#else /* DISABLE_JAVA_NET */
-
 jbyteArray
 java::net::InetAddress::aton (jstring host)
 {
@@ -351,5 +323,3 @@ java::net::InetAddress::getLocalHostname ()
   // anyway, thanks to the InetAddress.localhost cache.
   return JvNewStringUTF (chars);
 }
-
-#endif /* DISABLE_JAVA_NET */

diff --git a/libjava/java/net/natNetworkInterfaceWin32.cc b/libjava/java/net/natNetworkInterfaceWin32.cc
index 47d68b5fd6501005d571e4d54b5b65e1b0d9b727..c204841778abe444f0b62c80feb61b68e3eac7c7 100644 (file)
--- a/libjava/java/net/natNetworkInterfaceWin32.cc
+++ b/libjava/java/net/natNetworkInterfaceWin32.cc
@@ -52,17 +52,6 @@ details.  */
 #include <java/net/SocketException.h>
 #include <java/util/Vector.h>
 
-#ifdef DISABLE_JAVA_NET
-
-::java::util::Vector*
-java::net::NetworkInterface::getRealNetworkInterfaces ()
-{
-  ::java::util::Vector* ht = new ::java::util::Vector();
-  return ht;
-}
-
-#else /* DISABLE_JAVA_NET */
-
 ::java::util::Vector*
 java::net::NetworkInterface::getRealNetworkInterfaces ()
 {
@@ -138,5 +127,3 @@ java::net::NetworkInterface::getRealNetworkInterfaces ()
   return ht;
 #endif /* WIN32 */
 }
-
-#endif // DISABLE_JAVA_NET //

diff --git a/libjava/java/net/natPlainDatagramSocketImplWin32.cc b/libjava/java/net/natPlainDatagramSocketImplWin32.cc
index d0d006d4b4397367c0cb85b40eaaf9309b69ae15..bf7b69e3c64487c3c7cd60d9d00e29bbca318142 100644 (file)
--- a/libjava/java/net/natPlainDatagramSocketImplWin32.cc
+++ b/libjava/java/net/natPlainDatagramSocketImplWin32.cc
@@ -47,111 +47,6 @@ details.  */
 #include <java/lang/Boolean.h>
 #include <java/lang/Integer.h>
 
-#ifdef DISABLE_JAVA_NET
-
-void
-java::net::PlainDatagramSocketImpl::create ()
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.create: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::bind (jint, java::net::InetAddress *)
-{
-  throw new BindException (
-    JvNewStringLatin1 ("DatagramSocketImpl.bind: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::connect (java::net::InetAddress *, jint)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.connect: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::disconnect ()
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.disconnect: unimplemented"));
-}
-
-jint
-java::net::PlainDatagramSocketImpl::peek (java::net::InetAddress *)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.peek: unimplemented"));
-}
-
-jint
-java::net::PlainDatagramSocketImpl::peekData(java::net::DatagramPacket *)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.peekData: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::close ()
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.close: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::send (java::net::DatagramPacket *)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.send: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket *)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.receive: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::setTimeToLive (jint)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.setTimeToLive: unimplemented"));
-}
-
-jint
-java::net::PlainDatagramSocketImpl::getTimeToLive ()
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.getTimeToLive: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress *,
-                                              java::net::NetworkInterface *,
-                                             jboolean)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("DatagramSocketImpl.mcastGrp: unimplemented"));
-}
-
-void
-java::net::PlainDatagramSocketImpl::setOption (jint, java::lang::Object *)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.setOption: unimplemented"));
-}
-
-java::lang::Object *
-java::net::PlainDatagramSocketImpl::getOption (jint)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("DatagramSocketImpl.getOption: unimplemented"));
-}
-
-#else /* DISABLE_JAVA_NET */
-
-
 union SockAddr
 {
   struct sockaddr_in address;
@@ -868,5 +763,3 @@ java::net::PlainDatagramSocketImpl::getOption (jint optID)
   char* strerr = strerror (errno);
   throw new java::net::SocketException (JvNewStringUTF (strerr));
 }
-
-#endif /* DISABLE_JAVA_NET */

diff --git a/libjava/java/net/natPlainSocketImplWin32.cc b/libjava/java/net/natPlainSocketImplWin32.cc
index 1485ea842f979f10e4295d074ff39a96ce08bd44..5f1a4e0920404a2d328397e278a0388a0d1ff8c0 100644 (file)
--- a/libjava/java/net/natPlainSocketImplWin32.cc
+++ b/libjava/java/net/natPlainSocketImplWin32.cc
@@ -9,8 +9,6 @@ details.  */
 #include <config.h>
 #include <platform.h>
 
-#ifndef DISABLE_JAVA_NET
-
 #ifdef WIN32
 
 #include <windows.h>
@@ -54,7 +52,6 @@ read(int s, void *buf, int len)
 #include <string.h>
 
 #endif /* WIN32 */
-#endif /* DISABLE_JAVA_NET */
 
 #if HAVE_BSTRING_H
 // Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 
@@ -83,122 +80,6 @@ read(int s, void *buf, int len)
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
 #include <java/lang/IllegalArgumentException.h>
 
-#ifdef DISABLE_JAVA_NET
-
-void
-java::net::PlainSocketImpl::create (jboolean)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("SocketImpl.create: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::bind (java::net::InetAddress *, jint)
-{
-  throw new BindException (
-    JvNewStringLatin1 ("SocketImpl.bind: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::connect (java::net::SocketAddress *, jint)
-{
-  throw new ConnectException (
-    JvNewStringLatin1 ("SocketImpl.connect: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::listen (jint)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("SocketImpl.listen: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *)
-{
-  throw new java::io::IOException (
-    JvNewStringLatin1 ("SocketImpl.accept: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::setOption (jint, java::lang::Object *)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.setOption: unimplemented"));
-}
-
-java::lang::Object *
-java::net::PlainSocketImpl::getOption (jint)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.getOption: unimplemented"));
-}
-
-jint
-java::net::PlainSocketImpl::read(void)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.read: unimplemented"));
-}
-
-jint
-java::net::PlainSocketImpl::read(jbyteArray buffer, jint offset, jint count)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.read: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::write(jint b)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.write: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::write(jbyteArray b, jint offset, jint len)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.write: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::sendUrgentData(jint data)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.sendUrgentData: unimplemented"));
-}
-
-jint
-java::net::PlainSocketImpl::available(void)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.available: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::close(void)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.close: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::shutdownInput (void)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.shutdownInput: unimplemented"));
-}
-
-void
-java::net::PlainSocketImpl::shutdownOutput (void)
-{
-  throw new SocketException (
-    JvNewStringLatin1 ("SocketImpl.shutdownOutput: unimplemented"));
-}
-
-#else /* DISABLE_JAVA_NET */
-
 union SockAddr
 {
   struct sockaddr_in address;
@@ -1015,5 +896,3 @@ java::net::PlainSocketImpl::shutdownOutput (void)
   if (::shutdown (fnum, 1))
     throw new SocketException (JvNewStringUTF (strerror (errno)));
 }
-
-#endif /* DISABLE_JAVA_NET */