From 820112852a897e77e04d5015e8718433630b1e33 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Tue, 5 Sep 2000 11:05:59 +0000 Subject: natIconv.cc (read): Remove unused local. 2000-09-05 Bryce McKinlay * gnu/gcj/convert/natIconv.cc (read): Remove unused local. (write): Ditto. * gnu/gcj/runtime/FileDeleter.java (deleteOnExitNow): Check for null stack. Synchronize. * java/lang/fdlibm.h: #undef __P if previously defined. * java/lang/natSystem.cc (currentTimeMillis): Remove unused local. * java/net/natPlainDatagramSocketImpl.cc (send): Remove unreachable block. (mcastGrp): Ditto. From-SVN: r36158 --- libjava/java/lang/fdlibm.h | 4 ++++ libjava/java/lang/natSystem.cc | 2 -- libjava/java/net/natPlainDatagramSocketImpl.cc | 6 ------ 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/fdlibm.h b/libjava/java/lang/fdlibm.h index 228208f..1544c0a 100644 --- a/libjava/java/lang/fdlibm.h +++ b/libjava/java/lang/fdlibm.h @@ -23,6 +23,10 @@ /* CYGNUS LOCAL: Default to XOPEN_MODE. */ #define _XOPEN_MODE +#ifdef __P +#undef __P +#endif + #ifdef __STDC__ #define __P(p) p #else diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index 39deab2..1ea29b3 100644 --- a/libjava/java/lang/natSystem.cc +++ b/libjava/java/lang/natSystem.cc @@ -140,8 +140,6 @@ java::lang::System::arraycopy (jobject src, jint src_offset, jlong java::lang::System::currentTimeMillis (void) { - jlong r; - struct timeval tv; _Jv_gettimeofday (&tv); return (jlong) tv.tv_sec * 1000 + tv.tv_usec / 1000; diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index 2fac17e..78c2c2a 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -287,9 +287,6 @@ java::net::PlainDatagramSocketImpl::send (java::net::DatagramPacket *p) if (::sendto (fnum, (char *) dbytes, p->getLength(), 0, ptr, len) >= 0) return; - error: - char* strerr = strerror (errno); - JvThrow (new java::io::IOException (JvNewStringUTF (strerr))); } void @@ -420,9 +417,6 @@ java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress *inetaddr, if (::setsockopt (fnum, level, opname, ptr, len) == 0) return; - error: - char* strerr = strerror (errno); - JvThrow (new java::io::IOException (JvNewStringUTF (strerr))); } void -- cgit v1.1