From: Bruno Haible Date: Sat, 17 Dec 2016 18:47:46 +0000 (+0100) Subject: fmodl: Avoid redefinition error on MSVC. X-Git-Tag: v1.0~6471 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b31297ff0bf6df85fe861075831268957c0f061d;p=gnulib.git fmodl: Avoid redefinition error on MSVC. * m4/fmodl.m4 (gl_FUNC_FMODL): Set REPLACE_FMODL to 1 if the function may be defined as an inline function. --- diff --git a/ChangeLog b/ChangeLog index 093964a603..0fdce80032 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-12-17 Bruno Haible + + fmodl: Avoid redefinition error on MSVC. + * m4/fmodl.m4 (gl_FUNC_FMODL): Set REPLACE_FMODL to 1 if the function + may be defined as an inline function. + 2016-12-17 Bruno Haible fmodf: Avoid redefinition error on MSVC. diff --git a/m4/fmodl.m4 b/m4/fmodl.m4 index c772ab6320..05dc6ecd83 100644 --- a/m4/fmodl.m4 +++ b/m4/fmodl.m4 @@ -1,4 +1,4 @@ -# fmodl.m4 serial 5 +# fmodl.m4 serial 6 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, @@ -86,6 +86,10 @@ int main (int argc, char *argv[]) ]) else HAVE_FMODL=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_fmodl, not fmodl. + AC_CHECK_DECLS([fmodl], [REPLACE_FMODL=1], , [[#include ]]) fi if test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; then dnl Find libraries needed to link lib/fmodl.c.