Merge pull request numpy#3541 from jeromekelleher/patch-1

njsmith · njsmith · commit 756dad2846b3 · 2013-07-24T12:56:24.000-07:00
BUG: make preprocessor tests consistent in halffloat.c
diff --git a/numpy/core/src/npymath/halffloat.c b/numpy/core/src/npymath/halffloat.c
@@ -137,7 +137,7 @@ npy_half npy_half_nextafter(npy_half x, npy_half y)
             ret = x+1;
         }
     }
-#ifdef NPY_HALF_GENERATE_OVERFLOW
+#if NPY_HALF_GENERATE_OVERFLOW
     if (npy_half_isinf(ret)) {
         npy_set_floatstatus_overflow();
     }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ npy_half npy_half_nextafter(npy_half x, npy_half y)`
`137`	`137`	`ret = x+1;`
`138`	`138`	`}`
`139`	`139`	`}`
`140`		`-#ifdef NPY_HALF_GENERATE_OVERFLOW`
	`140`	`+#if NPY_HALF_GENERATE_OVERFLOW`
`141`	`141`	`if (npy_half_isinf(ret)) {`
`142`	`142`	`npy_set_floatstatus_overflow();`
`143`	`143`	`}`