summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-01-22 08:16:39 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-01-22 08:16:39 +0000
commitc79bcec14a12a38a1563d1189324257e5df71397 (patch)
tree2e16dbbb7efa25e4f23c3a099093bde6a4712c12
parent6718010e16f63cf831a013282ca7d3208470a476 (diff)
downloadnumpy-c79bcec14a12a38a1563d1189324257e5df71397.tar.gz
fix so patch is applied correctly.v0.9.4
-rw-r--r--numpy/core/src/arraytypes.inc.src6
1 files changed, 1 insertions, 5 deletions
diff --git a/numpy/core/src/arraytypes.inc.src b/numpy/core/src/arraytypes.inc.src
index aacee298e..a973a9dac 100644
--- a/numpy/core/src/arraytypes.inc.src
+++ b/numpy/core/src/arraytypes.inc.src
@@ -760,7 +760,6 @@ static int
#func=(l,ul)*5#
#btype=(long,ulong)*5#
*/
-#if (PY_VERSION_HEX >= 0x02040000) || defined(PyOS_ascii_strtod)
static int
@fname@_fromstr(char *str, @type@ *ip, char **endptr, void *ignore)
{
@@ -770,16 +769,13 @@ static int
*ip = (@type@) result;
return 0;
}
-#else
-#define @fname@_fromstr NULL
-#endif
/**end repeat**/
/**begin repeat
#fname=FLOAT,DOUBLE,LONGDOUBLE#
#type=float,double,longdouble#
*/
-#if PY_VERSION_HEX >= 0x02040000
+#if (PY_VERSION_HEX >= 0x02040000) || defined(PyOS_ascii_strtod)
static int
@fname@_fromstr(char *str, @type@ *ip, char **endptr, void *ignore)
{