>From 21ec014a2ffe8d53dd1d4744ff5775853340e3cb Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sat, 17 Dec 2016 19:41:12 +0100
Subject: [PATCH 07/20] expf: Avoid redefinition error on MSVC.

* m4/math_h.m4 (gl_MATH_H_DEFAULTS): Define REPLACE_EXPF.
* m4/expf.m4 (gl_FUNC_EXPF): Set REPLACE_EXPF to 1 if the function
may be defined as an inline function.
* modules/math (Makefile.am): Substitute REPLACE_EXPF.
* lib/math.in.h (expf): Override if REPLACE_EXPF is 1.
---
 ChangeLog     |  9 +++++++++
 lib/math.in.h | 15 ++++++++++++---
 m4/expf.m4    |  6 +++++-
 m4/math_h.m4  |  1 +
 modules/math  |  1 +
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bca6f78..cb25d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2016-12-17  Bruno Haible  <address@hidden>
 
+	expf: Avoid redefinition error on MSVC.
+	* m4/math_h.m4 (gl_MATH_H_DEFAULTS): Define REPLACE_EXPF.
+	* m4/expf.m4 (gl_FUNC_EXPF): Set REPLACE_EXPF to 1 if the function
+	may be defined as an inline function.
+	* modules/math (Makefile.am): Substitute REPLACE_EXPF.
+	* lib/math.in.h (expf): Override if REPLACE_EXPF is 1.
+
+2016-12-17  Bruno Haible  <address@hidden>
+
 	coshf: Avoid redefinition error on MSVC.
 	* m4/math_h.m4 (gl_MATH_H_DEFAULTS): Define REPLACE_COSHF.
 	* m4/coshf.m4 (gl_FUNC_COSHF): Set REPLACE_COSHF to 1 if the function
diff --git a/lib/math.in.h b/lib/math.in.h
index ccaf56c..cc76a64 100644
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -589,11 +589,20 @@ _GL_WARN_ON_USE (coshf, "coshf is unportable - "
 
 
 #if @GNULIB_EXPF@
-# if address@hidden@
-#  undef expf
+# if @REPLACE_EXPF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef expf
+#   define expf rpl_expf
+#  endif
+_GL_FUNCDECL_RPL (expf, float, (float x));
+_GL_CXXALIAS_RPL (expf, float, (float x));
+# else
+#  if address@hidden@
+#   undef expf
 _GL_FUNCDECL_SYS (expf, float, (float x));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (expf, float, (float x));
+# endif
 _GL_CXXALIASWARN (expf);
 #elif defined GNULIB_POSIXCHECK
 # undef expf
diff --git a/m4/expf.m4 b/m4/expf.m4
index b2ff3f6..83d3de9 100644
--- a/m4/expf.m4
+++ b/m4/expf.m4
@@ -1,4 +1,4 @@
-# expf.m4 serial 2
+# expf.m4 serial 3
 dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -22,6 +22,10 @@ AC_DEFUN([gl_FUNC_EXPF],
     EXPF_LIBM="$EXP_LIBM"
   else
     HAVE_EXPF=0
+    dnl If the function is declared but does not appear to exist, it may be
+    dnl defined as an inline function. In order to avoid a conflict, we have
+    dnl to define rpl_expf, not expf.
+    AC_CHECK_DECLS([expf], [REPLACE_EXPF=1], , [[#include <math.h>]])
     EXPF_LIBM="$EXP_LIBM"
   fi
   AC_SUBST([EXPF_LIBM])
diff --git a/m4/math_h.m4 b/m4/math_h.m4
index 6993389..ac7a72d 100644
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -267,6 +267,7 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   REPLACE_CEILL=0;             AC_SUBST([REPLACE_CEILL])
   REPLACE_COSF=0;              AC_SUBST([REPLACE_COSF])
   REPLACE_COSHF=0;             AC_SUBST([REPLACE_COSHF])
+  REPLACE_EXPF=0;              AC_SUBST([REPLACE_EXPF])
   REPLACE_EXPM1=0;             AC_SUBST([REPLACE_EXPM1])
   REPLACE_EXPM1F=0;            AC_SUBST([REPLACE_EXPM1F])
   REPLACE_EXP2=0;              AC_SUBST([REPLACE_EXP2])
diff --git a/modules/math b/modules/math
index 0fa946b..497c692 100644
--- a/modules/math
+++ b/modules/math
@@ -236,6 +236,7 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
 	      -e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \
 	      -e 's|@''REPLACE_COSF''@|$(REPLACE_COSF)|g' \
 	      -e 's|@''REPLACE_COSHF''@|$(REPLACE_COSHF)|g' \
+	      -e 's|@''REPLACE_EXPF''@|$(REPLACE_EXPF)|g' \
 	      -e 's|@''REPLACE_EXPM1''@|$(REPLACE_EXPM1)|g' \
 	      -e 's|@''REPLACE_EXPM1F''@|$(REPLACE_EXPM1F)|g' \
 	      -e 's|@''REPLACE_EXP2''@|$(REPLACE_EXP2)|g' \
-- 
2.6.4