diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-04-19 00:31:39 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-04-19 00:31:39 +0000 |
| commit | 53876d9cd8a67d9e67772e082deab92a598f74b3 (patch) | |
| tree | 2d605900cab56cbfe55c6ca6e41f1a0c0cb6f91b /PC | |
| parent | dc3e06ce3a24882a6b68ec19544910095770111e (diff) | |
| download | cpython-git-53876d9cd8a67d9e67772e082deab92a598f74b3.tar.gz | |
Merged revisions 62380,62382-62383 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62380 | christian.heimes | 2008-04-19 01:13:07 +0200 (Sat, 19 Apr 2008) | 3 lines
I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math.
The patch also adds acosh, asinh, atanh, log1p and copysign to all platforms. Finally it fixes differences between platforms like different results or exceptions for edge cases. Have fun :)
........
r62382 | christian.heimes | 2008-04-19 01:40:40 +0200 (Sat, 19 Apr 2008) | 2 lines
Added new files to Windows project files
More Windows related fixes are coming soon
........
r62383 | christian.heimes | 2008-04-19 01:49:11 +0200 (Sat, 19 Apr 2008) | 1 line
Stupid me. Py_RETURN_NAN should actually return something ...
........
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VC6/pythoncore.dsp | 4 | ||||
| -rw-r--r-- | PC/VS7.1/pythoncore.vcproj | 3 | ||||
| -rw-r--r-- | PC/VS8.0/pythoncore.vcproj | 4 | ||||
| -rw-r--r-- | PC/pyconfig.h | 5 |
4 files changed, 14 insertions, 2 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index de8860f982..969e9df012 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.dsp @@ -587,6 +587,10 @@ SOURCE=..\..\Python\pyfpe.c # End Source File
# Begin Source File
+SOURCE=..\..\Python\pymath.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Python\pystate.c
# End Source File
# Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj index 304b11999f..cc46faf0d7 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -698,6 +698,9 @@ RelativePath="..\..\Python\pyfpe.c"> </File> <File + RelativePath="..\..\Python\pymath.c"> + </File> + <File RelativePath="..\..\Python\pystate.c"> </File> <File diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj index b63ed88501..6bc471557c 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -1707,6 +1707,10 @@ >
</File>
<File
+ RelativePath="..\..\Python\pymath.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Python\pystate.c"
>
</File>
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 4291192d70..e38e823530 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -207,12 +207,13 @@ typedef _W64 int ssize_t; #endif /* MS_WIN32 && !MS_WIN64 */ typedef int pid_t; -#define hypot _hypot #include <float.h> #define Py_IS_NAN _isnan #define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X)) #define Py_IS_FINITE(X) _finite(X) +#define copysign _copysign +#define hypot _hypot #endif /* _MSC_VER */ @@ -392,7 +393,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* Fairly standard from here! */ /* Define to 1 if you have the `copysign' function. */ -/* #define HAVE_COPYSIGN 1*/ +#define HAVE_COPYSIGN 1 /* Define to 1 if you have the `isinf' function. */ #define HAVE_ISINF 1 |