diff options
| author | Bruno Haible <bruno@clisp.org> | 2016-12-17 19:08:14 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2016-12-17 23:09:00 +0100 |
| commit | c3cb8a26341933b414e53e79457bb9906d07e9f3 (patch) | |
| tree | 46bfa9b081988dac6b71891800f2e8ebb463f2b2 /lib | |
| parent | 0f5a9a947267987458a82e7fc64140313c023640 (diff) | |
| download | gnulib-c3cb8a26341933b414e53e79457bb9906d07e9f3.tar.gz | |
acosf: Avoid redefinition error on MSVC.
* m4/math_h.m4 (gl_MATH_H_DEFAULTS): Define REPLACE_ACOSF.
* m4/acosf.m4 (gl_FUNC_ACOSF): Set REPLACE_ACOSF to 1 if the function
may be defined as an inline function.
* modules/math (Makefile.am): Substitute REPLACE_ACOSF.
* lib/math.in.h (acosf): Override if REPLACE_ACOSF is 1.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/math.in.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/math.in.h b/lib/math.in.h index e1dc97030f..f46d2df477 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -212,11 +212,20 @@ _NaN () #if @GNULIB_ACOSF@ -# if !@HAVE_ACOSF@ -# undef acosf +# if @REPLACE_ACOSF@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef acosf +# define acosf rpl_acosf +# endif +_GL_FUNCDECL_RPL (acosf, float, (float x)); +_GL_CXXALIAS_RPL (acosf, float, (float x)); +# else +# if !@HAVE_ACOSF@ +# undef acosf _GL_FUNCDECL_SYS (acosf, float, (float x)); -# endif +# endif _GL_CXXALIAS_SYS (acosf, float, (float x)); +# endif _GL_CXXALIASWARN (acosf); #elif defined GNULIB_POSIXCHECK # undef acosf |