Merge remote-tracking branch 'origin/master'

# Conflicts: # nidaqmx/task.py
ni · Jul 10, 2017 · fe11664 · fe11664
2 parents e23f517 + 552b12a
commit fe11664
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/nidaqmx/task.py b/nidaqmx/task.py
@@ -889,6 +889,11 @@ def register_signal_event(self, signal_type, callback_method):
         DAQmxSignalEventCallbackPtr = ctypes.CFUNCTYPE(
             ctypes.c_int32, lib_importer.task_handle, ctypes.c_int32,
             ctypes.c_void_p)
+
+        cfunc = lib_importer.daqlib.DAQmxRegisterSignalEvent
+        cfunc.argtypes = [
+            lib_importer.task_handle, ctypes.c_int, ctypes.c_uint,
+            DAQmxSignalEventCallbackPtr, ctypes.c_void_p]
 
         cfunc = lib_importer.daqlib.DAQmxRegisterSignalEvent
         cfunc.argtypes = [