diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-01-10 20:02:47 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-01-10 20:02:47 +0000 |
| commit | 7c80a0c83961086a23fca25698a90e80d31c162b (patch) | |
| tree | 21c222f9547fd52840d088697f88e9bb8c604a83 /libjava | |
| parent | b8667333867d541aad3d5ca72f575ce05dddfdbf (diff) | |
2000-01-10 Jeff Sturm <jsturm@sigma6.com>
* java/lang/natMath.cc (pow): Cast args to `double', not
`jdouble'.
(atan2): Likewise.
(IEEEremainder): Likewise.
* java/lang/mprec.h: Don't wrap includes in `extern "C"'.
* java/lang/fdlibm.h: Don't wrap includes in `extern "C"'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31305 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/java/lang/fdlibm.h | 10 | ||||
| -rw-r--r-- | libjava/java/lang/mprec.h | 9 | ||||
| -rw-r--r-- | libjava/java/lang/natMath.cc | 8 |
4 files changed, 22 insertions, 14 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 94513781289..fdd5fe1f612 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2000-01-10 Jeff Sturm <jsturm@sigma6.com> + + * java/lang/natMath.cc (pow): Cast args to `double', not + `jdouble'. + (atan2): Likewise. + (IEEEremainder): Likewise. + * java/lang/mprec.h: Don't wrap includes in `extern "C"'. + * java/lang/fdlibm.h: Don't wrap includes in `extern "C"'. + 2000-01-09 Anthony Green <green@cygnus.com> * java/lang/natString.cc (init): Test for overflow condition diff --git a/libjava/java/lang/fdlibm.h b/libjava/java/lang/fdlibm.h index 00d43e55238..228208fedfd 100644 --- a/libjava/java/lang/fdlibm.h +++ b/libjava/java/lang/fdlibm.h @@ -2,7 +2,7 @@ /* @(#)fdlibm.h 5.1 93/09/24 */ /* * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * Copyright (C) 1993, 2000 by Sun Microsystems, Inc. All rights reserved. * * Developed at SunPro, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this @@ -12,10 +12,6 @@ */ -#ifdef __cplusplus -extern "C" { -#endif - #include <config.h> #include <stdlib.h> @@ -48,6 +44,10 @@ extern "C" { #define _IEEE_LIBM +#ifdef __cplusplus +extern "C" { +#endif + /* * ANSI/POSIX */ diff --git a/libjava/java/lang/mprec.h b/libjava/java/lang/mprec.h index fbfba4c3ba0..61d9d50dead 100644 --- a/libjava/java/lang/mprec.h +++ b/libjava/java/lang/mprec.h @@ -2,7 +2,7 @@ * * The author of this software is David M. Gay. * - * Copyright (c) 1991 by AT&T. + * Copyright (c) 1991, 2000 by AT&T. * * Permission to use, copy, modify, and distribute this software for any * purpose without fee is hereby granted, provided that this entire notice @@ -26,10 +26,6 @@ dmg@research.att.com or research!dmg */ -#ifdef __cplusplus -extern "C" { -#endif - #include <config.h> #include "ieeefp.h" @@ -51,6 +47,9 @@ extern "C" { #include <sys/config.h> #endif +#ifdef __cplusplus +extern "C" { +#endif /* ISO C9X int type declarations */ diff --git a/libjava/java/lang/natMath.cc b/libjava/java/lang/natMath.cc index bdfc9f9cd9e..88c0f8d81fb 100644 --- a/libjava/java/lang/natMath.cc +++ b/libjava/java/lang/natMath.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Cygnus Solutions +/* Copyright (C) 1998, 1999, 2000 Cygnus Solutions This file is part of libgcj. @@ -59,7 +59,7 @@ jdouble java::lang::Math::atan(jdouble x) jdouble java::lang::Math::atan2(jdouble y, jdouble x) { - return (jdouble)::atan2((jdouble)y, (jdouble)x); + return (jdouble)::atan2((double)y, (double)x); } jdouble java::lang::Math::log(jdouble x) @@ -79,12 +79,12 @@ jdouble java::lang::Math::sqrt(jdouble x) jdouble java::lang::Math::pow(jdouble y, jdouble x) { - return (jdouble)::pow((jdouble)y, (jdouble)x); + return (jdouble)::pow((double)y, (double)x); } jdouble java::lang::Math::IEEEremainder(jdouble y, jdouble x) { - return (jdouble)::__ieee754_remainder((jdouble)y, (jdouble)x); + return (jdouble)::__ieee754_remainder((double)y, (double)x); } jdouble java::lang::Math::abs(jdouble x) |