mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fixed a wrong assumption in configure.in and Include/pyport.h. The is finite function is not called isfinite() but finite(). Sorry, my fault. :)

Browse source
This commit is contained in:
Christian Heimes 2008-01-20 14:28:28 +00:00
parent 858493251f
commit 487235109b
5 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/pyport.h
View file

@ -405,8 +405,8 @@ extern "C" {
* macro for this particular test is useful * macro for this particular test is useful
*/ */
#ifndef Py_IS_FINITE #ifndef Py_IS_FINITE
#ifdef HAVE_ISFINITE #ifdef HAVE_FINITE
#define Py_IS_FINITE(X) isfinite #define Py_IS_FINITE(X) finite
#else #else
#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) #define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X))
#endif #endif

3
Python/hypot.c
View file

@ -2,6 +2,7 @@
#include "Python.h" #include "Python.h"
#ifndef HAVE_HYPOT
double hypot(double x, double y) double hypot(double x, double y)
{ {
double yx; double yx;
@ -20,3 +21,5 @@ double hypot(double x, double y)
return x*sqrt(1.+yx*yx); return x*sqrt(1.+yx*yx);
} }
} }
#endif /* HAVE_HYPOT */

10
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 59611 . # From configure.in Revision: 59819 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6. # Generated by GNU Autoconf 2.61 for python 2.6.
# #
@ -20373,7 +20373,6 @@ fi
# ************************************ # ************************************
# * Check for mathematical functions * # * Check for mathematical functions *
# ************************************ # ************************************
# check for hypot() in math library
LIBS_SAVE=$LIBS LIBS_SAVE=$LIBS
LIBS="$LIBS $LIBM" LIBS="$LIBS $LIBM"
@ -20483,7 +20482,12 @@ done
for ac_func in copysign isfinite isnan isinf
for ac_func in acosh asinh atanh copysign expm1 finite isinf isnan log1p
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5 { echo "$as_me:$LINENO: checking for $ac_func" >&5

3
configure.in
View file

@ -2978,12 +2978,11 @@ fi],
# ************************************ # ************************************
# * Check for mathematical functions * # * Check for mathematical functions *
# ************************************ # ************************************
# check for hypot() in math library
LIBS_SAVE=$LIBS LIBS_SAVE=$LIBS
LIBS="$LIBS $LIBM" LIBS="$LIBS $LIBM"
AC_REPLACE_FUNCS(hypot) AC_REPLACE_FUNCS(hypot)
AC_CHECK_FUNCS(copysign isfinite isnan isinf) AC_CHECK_FUNCS(acosh asinh atanh copysign expm1 finite isinf isnan log1p)
LIBS=$LIBS_SAVE LIBS=$LIBS_SAVE

21
pyconfig.h.in
View file

@ -28,6 +28,9 @@
the case on Motorola V4 (R40V4.2) */ the case on Motorola V4 (R40V4.2) */
#undef GETTIMEOFDAY_NO_TZ #undef GETTIMEOFDAY_NO_TZ
/* Define to 1 if you have the `acosh' function. */
#undef HAVE_ACOSH
/* struct addrinfo (netdb.h) */ /* struct addrinfo (netdb.h) */
#undef HAVE_ADDRINFO #undef HAVE_ADDRINFO
@ -37,9 +40,15 @@
/* Define this if your time.h defines altzone. */ /* Define this if your time.h defines altzone. */
#undef HAVE_ALTZONE #undef HAVE_ALTZONE
/* Define to 1 if you have the `asinh' function. */
#undef HAVE_ASINH
/* Define to 1 if you have the <asm/types.h> header file. */ /* Define to 1 if you have the <asm/types.h> header file. */
#undef HAVE_ASM_TYPES_H #undef HAVE_ASM_TYPES_H
/* Define to 1 if you have the `atanh' function. */
#undef HAVE_ATANH
/* Define if GCC supports __attribute__((format(PyArg_ParseTuple, 2, 3))) */ /* Define if GCC supports __attribute__((format(PyArg_ParseTuple, 2, 3))) */
#undef HAVE_ATTRIBUTE_FORMAT_PARSETUPLE #undef HAVE_ATTRIBUTE_FORMAT_PARSETUPLE
@ -144,6 +153,9 @@
/* Define to 1 if you have the `execv' function. */ /* Define to 1 if you have the `execv' function. */
#undef HAVE_EXECV #undef HAVE_EXECV
/* Define to 1 if you have the `expm1' function. */
#undef HAVE_EXPM1
/* Define if you have the 'fchdir' function. */ /* Define if you have the 'fchdir' function. */
#undef HAVE_FCHDIR #undef HAVE_FCHDIR
@ -159,6 +171,9 @@
/* Define if you have the 'fdatasync' function. */ /* Define if you have the 'fdatasync' function. */
#undef HAVE_FDATASYNC #undef HAVE_FDATASYNC
/* Define to 1 if you have the `finite' function. */
#undef HAVE_FINITE
/* Define if you have the 'flock' function. */ /* Define if you have the 'flock' function. */
#undef HAVE_FLOCK #undef HAVE_FLOCK
@ -291,9 +306,6 @@
/* Define to 1 if you have the <io.h> header file. */ /* Define to 1 if you have the <io.h> header file. */
#undef HAVE_IO_H #undef HAVE_IO_H
/* Define to 1 if you have the `isfinite' function. */
#undef HAVE_ISFINITE
/* Define to 1 if you have the `isinf' function. */ /* Define to 1 if you have the `isinf' function. */
#undef HAVE_ISINF #undef HAVE_ISINF
@ -357,6 +369,9 @@
/* Define to 1 if you have the <linux/tipc.h> header file. */ /* Define to 1 if you have the <linux/tipc.h> header file. */
#undef HAVE_LINUX_TIPC_H #undef HAVE_LINUX_TIPC_H
/* Define to 1 if you have the `log1p' function. */
#undef HAVE_LOG1P
/* Define this if you have the type long long. */ /* Define this if you have the type long long. */
#undef HAVE_LONG_LONG #undef HAVE_LONG_LONG