Merge remote-tracking branch 'fweimer-rh/c99'

Signed-off-by: Benn Snyder <[email protected]>
Reviewed-by: Benn Snyder <[email protected]>

Author: piedar

CMakeLists.txt

@@ -47,7 +47,7 @@ include (SetupDirectories)
 
 set (PROJECT_VER_MAJOR 0)
 set (PROJECT_VER_MINOR 7)
-set (PROJECT_VER_PATCH 3)
+set (PROJECT_VER_PATCH 4)
 set (PROJECT_VER
   "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
 set (PROJECT_APIVER

wrappers/python/freenect.pyx

@@ -27,7 +27,6 @@ import numpy as np
 cimport numpy as npc
 
 cdef extern from "numpy/arrayobject.h":
-    void import_array()
     cdef object PyArray_SimpleNewFromData(int nd, npc.npy_intp *dims,
                                            int typenum, void *data)
 
@@ -455,7 +454,7 @@ def base_runloop(CtxPtr ctx, body=None):
     except Kill:
         pass
 
-import_array()
+npc.import_array()
 
 cdef object _depth_cb_np(void *data, freenect_frame_mode *mode):
     cdef npc.npy_intp dims[2]