3 files changed, 13 insertions, 14 deletions
diff --git a/libjava/java/lang/fdlibm.h b/libjava/java/lang/fdlibm.h
index 00d43e5..228208f 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 fbfba4c..61d9d50 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 bdfc9f9..88c0f8d 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)