aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/c99_protos.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 42b35f4..6825bc3 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-08 Francois-Xavier Coudert <coudert@clipper.ens.fr>
+
+ * c99_protos.h: Correctly protect definitions of prototypes for
+ asinhf, acoshf and atanhf to be the same as in intrinsics/hyper.c.
+
2006-10-08 Paul Thomas <pault@gcc.gnu.org>
Erik Edelmann <edelmann@gcc.gnu.org>
diff --git a/libgfortran/c99_protos.h b/libgfortran/c99_protos.h
index 96f9915..b7c992c 100644
--- a/libgfortran/c99_protos.h
+++ b/libgfortran/c99_protos.h
@@ -1,5 +1,5 @@
/* Declarations of various C99 functions
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -35,7 +35,7 @@ Boston, MA 02110-1301, USA. */
extern float acosf(float);
#endif
-#ifndef HAVE_ACOSHF
+#if HAVE_ACOSH && !HAVE_ACOSHF
#define HAVE_ACOSHF 1
extern float acoshf(float);
#endif
@@ -45,7 +45,7 @@ extern float acoshf(float);
extern float asinf(float);
#endif
-#ifndef HAVE_ASINHF
+#if HAVE_ASINH && !HAVE_ASINHF
#define HAVE_ASINHF 1
extern float asinhf(float);
#endif
@@ -60,7 +60,7 @@ extern float atan2f(float, float);
extern float atanf(float);
#endif
-#ifndef HAVE_ATANHF
+#if HAVE_ATANH && !HAVE_ATANHF
#define HAVE_ATANHF 1
extern float atanhf(float);
#endif