[Numpy-svn] r6014 - in trunk/numpy: core/src distutils/command
numpy-svn at scipy.org
numpy-svn at scipy.org
Wed Nov 12 00:47:16 EST 2008
Author: charris
Date: 2008-11-11 23:47:09 -0600 (Tue, 11 Nov 2008)
New Revision: 6014
Modified:
trunk/numpy/core/src/math_c99.inc.src
trunk/numpy/distutils/command/config.py
Log:
Some spelling corrections.
Some experiments for MSVC.
Modified: trunk/numpy/core/src/math_c99.inc.src
===================================================================
--- trunk/numpy/core/src/math_c99.inc.src 2008-11-12 01:28:23 UTC (rev 6013)
+++ trunk/numpy/core/src/math_c99.inc.src 2008-11-12 05:47:09 UTC (rev 6014)
@@ -11,6 +11,8 @@
*****************************************************************************
*/
+#ifndef _MSC_VER
+
/**begin repeat
* #type = float, double, longdouble#
* #c = f, ,l#
@@ -18,7 +20,8 @@
/**begin repeat1
* #kind = sin,cos,tan,sinh,cosh,tanh,fabs,floor,ceil,rint,trunc,sqrt,log10,
- * log,exp,expm1,asin,acos,atan,asinh,acosh,atanh,log1p,exp2,log2#
+ * log,exp,expm1,asin,acos,atan,asinh,acosh,atanh,log1p,exp2,log2,
+ * logb#
*/
@type@ @kind@@c@(@type@ x);
@@ -26,7 +29,7 @@
/**end repeat1**/
/**begin repeat1
- * #kind = atan2,hypot,pow,fmod#
+ * #kind = atan2,hypot,pow,fmod,scalb#
*/
@type@ @kind@@c@(@type@ x, @type@ y);
@@ -34,7 +37,13 @@
/**end repeat1**/
@type@ modf at c@(@type@ x, @type@ *iptr);
+ at type@ ldexp at c@(@type@ x, int iexp);
+ at type@ frexp at c@(@type@ x, int *iptr);
+ at type@ scalbn at c@(@type@ x, int pow);
+ at type@ scalbln at c@(@type@ x, long pow);
+#endif
+
/**end repeat**/
/*
*****************************************************************************
Modified: trunk/numpy/distutils/command/config.py
===================================================================
--- trunk/numpy/distutils/command/config.py 2008-11-12 01:28:23 UTC (rev 6013)
+++ trunk/numpy/distutils/command/config.py 2008-11-12 05:47:09 UTC (rev 6014)
@@ -126,9 +126,9 @@
body = []
if decl:
body.append("int %s (void);" % func)
- # Handle MSVC intrisincs: force MS compiler to make a function call.
+ # Handle MSVC intrinsics: force MS compiler to make a function call.
# Useful to test for some functions when built with optimization on, to
- # avoid build error because the intrisinc and our 'fake' test
+ # avoid build error because the intrinsic and our 'fake' test
# declaration do not match.
body.append("#ifdef _MSC_VER")
body.append("#pragma function(%s)" % func)
More information about the Numpy-svn
mailing list