diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2017-02-06 14:22:23 +0100 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2017-02-07 15:13:54 +0100 |
| commit | 5c9160f44e50073bd9cd3d6b8770ff47b4a2dd22 (patch) | |
| tree | 8b9265f9d603d3393eb868409738cf5edc4e2f7e /libgfortran | |
| parent | 4e90038f7c0e5338488ed9da8820ac806f97e471 (diff) | |
Merge branches/gcc-5-branch rev 245200.
Change-Id: Ia597a8e8754078440700f8cc59a6742f548bc29e
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/c99_protos.h | 2 | ||||
| -rw-r--r-- | libgfortran/intrinsics/c99_functions.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 078910059f9..a0471221cc8 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2017-01-31 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/79305 + * c99_protos.h: Spell HAVE_EXPL correctly. + * intrinsics/c99_functions.c: Ditto. + 2016-10-31 Jerry DeLisle <jvdelisle@gcc.gnu.org> Backport from trunk diff --git a/libgfortran/c99_protos.h b/libgfortran/c99_protos.h index 45f4e262666..bb726162686 100644 --- a/libgfortran/c99_protos.h +++ b/libgfortran/c99_protos.h @@ -332,7 +332,7 @@ extern float complex cexpf (float complex); extern double complex cexp (double complex); #endif -#if !defined(HAVE_CEXPL) && defined(HAVE_COSL) && defined(HAVE_SINL) && defined(EXPL) +#if !defined(HAVE_CEXPL) && defined(HAVE_COSL) && defined(HAVE_SINL) && defined(HAVE_EXPL) #define HAVE_CEXPL 1 extern long double complex cexpl (long double complex); #endif diff --git a/libgfortran/intrinsics/c99_functions.c b/libgfortran/intrinsics/c99_functions.c index 7bfd16ab0d4..ddaca389e87 100644 --- a/libgfortran/intrinsics/c99_functions.c +++ b/libgfortran/intrinsics/c99_functions.c @@ -913,7 +913,7 @@ cexp (double complex z) } #endif -#if !defined(HAVE_CEXPL) && defined(HAVE_COSL) && defined(HAVE_SINL) && defined(EXPL) +#if !defined(HAVE_CEXPL) && defined(HAVE_COSL) && defined(HAVE_SINL) && defined(HAVE_EXPL) #define HAVE_CEXPL 1 long double complex cexpl (long double complex z); |