diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-05 11:05:59 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-05 11:05:59 +0000 |
| commit | 65c1684c1fc9896e8f2c846f0d3ac2e0988f54d7 (patch) | |
| tree | 87c10c159d39b1e4d311e86133275d497e9fcb61 /libjava/java | |
| parent | 31ab897a7f3929522ab1a8ce5574158a5de6d634 (diff) | |
2000-09-05 Bryce McKinlay <bryce@albatross.co.nz>
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36158 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/fdlibm.h | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 2 | ||||
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/libjava/java/lang/fdlibm.h b/libjava/java/lang/fdlibm.h index 228208fedfd..1544c0aad9e 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 39deab2ad04..1ea29b31840 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 2fac17ed828..78c2c2ac643 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 |