Merge 0471c74 into 0c44300

nipy · Aug 28, 2015 · 18db009 · 18db009
2 parents 0c44300 + 0471c74
commit 18db009
Show file tree

Hide file tree

Showing 50 changed files with 25,690 additions and 29,454 deletions.
diff --git a/Makefile b/Makefile
@@ -103,7 +103,7 @@ tox-stale:
 
 recythonize:
 	# Recythonize all pyx files
-	find . -name "*.pyx" -exec cython -I libcstat/wrapper {} \;
+	find . -name "*.pyx" -exec cython -I libcstat/wrapper -I lib/fff_python_wrapper {} \;
 
 .PHONY: orig-src pylint
 
diff --git a/lib/fff/fff_base.c b/lib/fff/fff_base.c
@@ -44,6 +44,8 @@ unsigned int fff_nbytes(fff_datatype type)
 }
 
 
+
+
 int fff_is_integer(fff_datatype type)
 {
   int ok = 0;