On 2016-12-17, I did not apply the common idioms for function overriding correctly in a few modules. This patch fixes it.
2025-12-04 Bruno Haible <[email protected]> expf, sinf, cosf, ...: Fix possible error on MSVC. * modules/sqrtf (configure.ac): Consider REPLACE_SQRTF. * modules/expf (configure.ac): Consider REPLACE_EXPF. * modules/sinf (configure.ac): Consider REPLACE_SINF. * modules/cosf (configure.ac): Consider REPLACE_COSF. * modules/tanf (configure.ac): Consider REPLACE_TANF. * modules/sinhf (configure.ac): Consider REPLACE_SINHF. * modules/coshf (configure.ac): Consider REPLACE_COSHF. * modules/tanhf (configure.ac): Consider REPLACE_TANHF. * modules/asinf (configure.ac): Consider REPLACE_ASINF. * modules/acosf (configure.ac): Consider REPLACE_ACOSF. * modules/atanf (configure.ac): Consider REPLACE_ATANF. * modules/atan2f (configure.ac): Consider REPLACE_ATAN2F. diff --git a/modules/acosf b/modules/acosf index 76a8826019..5d7925f139 100644 --- a/modules/acosf +++ b/modules/acosf @@ -8,11 +8,12 @@ m4/acosf.m4 Depends-on: math-h extensions -acos [test $HAVE_ACOSF = 0] +acos [test $HAVE_ACOSF = 0 || test $REPLACE_ACOSF = 1] configure.ac: gl_FUNC_ACOSF -gl_CONDITIONAL([GL_COND_OBJ_ACOSF], [test $HAVE_ACOSF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_ACOSF], + [test $HAVE_ACOSF = 0 || test $REPLACE_ACOSF = 1]) gl_MATH_MODULE_INDICATOR([acosf]) Makefile.am: diff --git a/modules/asinf b/modules/asinf index 8637adaafd..e9e3e4ce5e 100644 --- a/modules/asinf +++ b/modules/asinf @@ -8,11 +8,12 @@ m4/asinf.m4 Depends-on: math-h extensions -asin [test $HAVE_ASINF = 0] +asin [test $HAVE_ASINF = 0 || test $REPLACE_ASINF = 1] configure.ac: gl_FUNC_ASINF -gl_CONDITIONAL([GL_COND_OBJ_ASINF], [test $HAVE_ASINF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_ASINF], + [test $HAVE_ASINF = 0 || test $REPLACE_ASINF = 1]) gl_MATH_MODULE_INDICATOR([asinf]) Makefile.am: diff --git a/modules/atan2f b/modules/atan2f index d40adc4405..24ed7ca54e 100644 --- a/modules/atan2f +++ b/modules/atan2f @@ -8,11 +8,12 @@ m4/atan2f.m4 Depends-on: math-h extensions -atan2 [test $HAVE_ATAN2F = 0] +atan2 [test $HAVE_ATAN2F = 0 || test $REPLACE_ATAN2F = 1] configure.ac: gl_FUNC_ATAN2F -gl_CONDITIONAL([GL_COND_OBJ_ATAN2F], [test $HAVE_ATAN2F = 0]) +gl_CONDITIONAL([GL_COND_OBJ_ATAN2F], + [test $HAVE_ATAN2F = 0 || test $REPLACE_ATAN2F = 1]) gl_MATH_MODULE_INDICATOR([atan2f]) Makefile.am: diff --git a/modules/atanf b/modules/atanf index 88e882f42b..7f6b635ee7 100644 --- a/modules/atanf +++ b/modules/atanf @@ -8,11 +8,12 @@ m4/atanf.m4 Depends-on: math-h extensions -atan [test $HAVE_ATANF = 0] +atan [test $HAVE_ATANF = 0 || test $REPLACE_ATANF = 1] configure.ac: gl_FUNC_ATANF -gl_CONDITIONAL([GL_COND_OBJ_ATANF], [test $HAVE_ATANF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_ATANF], + [test $HAVE_ATANF = 0 || test $REPLACE_ATANF = 1]) gl_MATH_MODULE_INDICATOR([atanf]) Makefile.am: diff --git a/modules/cosf b/modules/cosf index b59deed70b..d3860e7376 100644 --- a/modules/cosf +++ b/modules/cosf @@ -8,11 +8,12 @@ m4/cosf.m4 Depends-on: math-h extensions -cos [test $HAVE_COSF = 0] +cos [test $HAVE_COSF = 0 || test $REPLACE_COSF = 1] configure.ac: gl_FUNC_COSF -gl_CONDITIONAL([GL_COND_OBJ_COSF], [test $HAVE_COSF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_COSF], + [test $HAVE_COSF = 0 || test $REPLACE_COSF = 1]) gl_MATH_MODULE_INDICATOR([cosf]) Makefile.am: diff --git a/modules/coshf b/modules/coshf index 96f367b53f..f885596be7 100644 --- a/modules/coshf +++ b/modules/coshf @@ -8,11 +8,12 @@ m4/coshf.m4 Depends-on: math-h extensions -cosh [test $HAVE_COSHF = 0] +cosh [test $HAVE_COSHF = 0 || test $REPLACE_COSHF = 1] configure.ac: gl_FUNC_COSHF -gl_CONDITIONAL([GL_COND_OBJ_COSHF], [test $HAVE_COSHF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_COSHF], + [test $HAVE_COSHF = 0 || test $REPLACE_COSHF = 1]) gl_MATH_MODULE_INDICATOR([coshf]) Makefile.am: diff --git a/modules/expf b/modules/expf index 4e4e747cca..c155533145 100644 --- a/modules/expf +++ b/modules/expf @@ -8,11 +8,12 @@ m4/expf.m4 Depends-on: math-h extensions -exp [test $HAVE_EXPF = 0] +exp [test $HAVE_EXPF = 0 || test $REPLACE_EXPF = 1] configure.ac: gl_FUNC_EXPF -gl_CONDITIONAL([GL_COND_OBJ_EXPF], [test $HAVE_EXPF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_EXPF], + [test $HAVE_EXPF = 0 || test $REPLACE_EXPF = 1]) gl_MATH_MODULE_INDICATOR([expf]) Makefile.am: diff --git a/modules/sinf b/modules/sinf index 818ce814e5..09e073e912 100644 --- a/modules/sinf +++ b/modules/sinf @@ -8,11 +8,12 @@ m4/sinf.m4 Depends-on: math-h extensions -sin [test $HAVE_SINF = 0] +sin [test $HAVE_SINF = 0 || test $REPLACE_SINF = 1] configure.ac: gl_FUNC_SINF -gl_CONDITIONAL([GL_COND_OBJ_SINF], [test $HAVE_SINF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_SINF], + [test $HAVE_SINF = 0 || test $REPLACE_SINF = 1]) gl_MATH_MODULE_INDICATOR([sinf]) Makefile.am: diff --git a/modules/sinhf b/modules/sinhf index ed2b6e4084..e39ddf81b7 100644 --- a/modules/sinhf +++ b/modules/sinhf @@ -8,11 +8,12 @@ m4/sinhf.m4 Depends-on: math-h extensions -sinh [test $HAVE_SINHF = 0] +sinh [test $HAVE_SINHF = 0 || test $REPLACE_SINHF = 1] configure.ac: gl_FUNC_SINHF -gl_CONDITIONAL([GL_COND_OBJ_SINHF], [test $HAVE_SINHF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_SINHF], + [test $HAVE_SINHF = 0 || test $REPLACE_SINHF = 1]) gl_MATH_MODULE_INDICATOR([sinhf]) Makefile.am: diff --git a/modules/sqrtf b/modules/sqrtf index e0ac0dd3f1..ad9368579e 100644 --- a/modules/sqrtf +++ b/modules/sqrtf @@ -8,11 +8,12 @@ m4/sqrtf.m4 Depends-on: math-h extensions -sqrt [test $HAVE_SQRTF = 0] +sqrt [test $HAVE_SQRTF = 0 || test $REPLACE_SQRTF = 1] configure.ac: gl_FUNC_SQRTF -gl_CONDITIONAL([GL_COND_OBJ_SQRTF], [test $HAVE_SQRTF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_SQRTF], + [test $HAVE_SQRTF = 0 || test $REPLACE_SQRTF = 1]) gl_MATH_MODULE_INDICATOR([sqrtf]) Makefile.am: diff --git a/modules/tanf b/modules/tanf index e5576b4ba0..6914ee6a2e 100644 --- a/modules/tanf +++ b/modules/tanf @@ -8,11 +8,12 @@ m4/tanf.m4 Depends-on: math-h extensions -tan [test $HAVE_TANF = 0] +tan [test $HAVE_TANF = 0 || test $REPLACE_TANF = 1] configure.ac: gl_FUNC_TANF -gl_CONDITIONAL([GL_COND_OBJ_TANF], [test $HAVE_TANF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_TANF], + [test $HAVE_TANF = 0 || test $REPLACE_TANF = 1]) gl_MATH_MODULE_INDICATOR([tanf]) Makefile.am: diff --git a/modules/tanhf b/modules/tanhf index 696fefbda3..abe649fee4 100644 --- a/modules/tanhf +++ b/modules/tanhf @@ -8,11 +8,12 @@ m4/tanhf.m4 Depends-on: math-h extensions -tanh [test $HAVE_TANHF = 0] +tanh [test $HAVE_TANHF = 0 || test $REPLACE_TANHF = 1] configure.ac: gl_FUNC_TANHF -gl_CONDITIONAL([GL_COND_OBJ_TANHF], [test $HAVE_TANHF = 0]) +gl_CONDITIONAL([GL_COND_OBJ_TANHF], + [test $HAVE_TANHF = 0 || test $REPLACE_TANHF = 1]) gl_MATH_MODULE_INDICATOR([tanhf]) Makefile.am:
