Merged revisions 59680-59695 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59686 | guido.van.rossum | 2008-01-04 00:54:04 +0100 (Fri, 04 Jan 2008) | 2 lines
Bug #1301: fixed a bad assert in _tkinter.
........
r59687 | raymond.hettinger | 2008-01-04 01:01:15 +0100 (Fri, 04 Jan 2008) | 3 lines
Finish-up the struct module optimizations started at the Iceland NFS sprint.
........
r59688 | christian.heimes | 2008-01-04 01:04:52 +0100 (Fri, 04 Jan 2008) | 1 line
Fixed #1687: plistlib.py restricts <integer> to Python int when writing
........
r59689 | christian.heimes | 2008-01-04 01:37:34 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1481296: Fixed long(float('nan'))!=0L.
........
r59691 | andrew.kuchling | 2008-01-04 02:15:50 +0100 (Fri, 04 Jan 2008) | 1 line
Markup fixes; grammar tweaks
........
r59692 | andrew.kuchling | 2008-01-04 02:16:12 +0100 (Fri, 04 Jan 2008) | 1 line
Add items
........
r59694 | christian.heimes | 2008-01-04 02:48:50 +0100 (Fri, 04 Jan 2008) | 1 line
Fixed math.copysign() on Windows
........
r59695 | christian.heimes | 2008-01-04 03:03:25 +0100 (Fri, 04 Jan 2008) | 1 line
Filled in some XXX comments
........
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
index 8992bae..62f9f0b 100644
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -133,14 +133,16 @@
"cos(x)\n\nReturn the cosine of x (measured in radians).")
FUNC1(cosh, cosh,
"cosh(x)\n\nReturn the hyperbolic cosine of x.")
-#if defined(MS_WINDOWS) || defined(HAVE_COPYSIGN)
+
#ifdef MS_WINDOWS
-FUNC2(copysign, _copysign,
-#else
+# define copysign _copysign
+# define HAVE_COPYSIGN 1
+#endif
+#ifdef HAVE_COPYSIGN
FUNC2(copysign, copysign,
+ "copysign(x,y)\n\nReturn x with the sign of y.");
#endif
- "copysign(x,y)\n\nReturn x with the sign of y.");
-#endif
+
FUNC1(exp, exp,
"exp(x)\n\nReturn e raised to the power of x.")
FUNC1(fabs, fabs,
@@ -383,7 +385,7 @@
{"atan", math_atan, METH_O, math_atan_doc},
{"atan2", math_atan2, METH_VARARGS, math_atan2_doc},
{"ceil", math_ceil, METH_O, math_ceil_doc},
-#if defined(MS_WINDOWS) || defined(HAVE_COPYSIGN)
+#ifdef HAVE_COPYSIGN
{"copysign", math_copysign, METH_VARARGS, math_copysign_doc},
#endif
{"cos", math_cos, METH_O, math_cos_doc},