Changeset 1108f3

Timestamp:

03/06/12 13:58:31 (15 months ago)

Author:

Erik Johansson <erik@…>

Branches:

('master', 'a231b56d57a69513303d0061f5fa3e3cd51c85c1')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

902c12d88d93b6cd0438380e4cce3a7ad409bbb1

Parents:

e921be65b427d1473693ad89d469c4e15449b773

git-author:

Erik Johansson <erik@ejohansson.se>2012-03-06 13:58:31+01:00

git-committer:

Erik Johansson <erik@ejohansson.se>2012-03-06 13:58:31+01:00

Message:

Return type for callbacks is void, not void*

Location:

examples/python

Files:

• callbacks.py (modified) (1 diff)
• sensors/sensorscallback.py (modified) (1 diff)

examples/python/callbacks.py

@@ -59 +59 @@
 
 if (platform.system() == 'Windows'):
-        CMPFUNC = WINFUNCTYPE(c_void_p, c_int, c_int, POINTER(c_ubyte), c_int, c_void_p) #first is return type
-        CMPFUNCRAW = WINFUNCTYPE(c_void_p, POINTER(c_ubyte), c_int, c_int, c_void_p)
+        CMPFUNC = WINFUNCTYPE(None, c_int, c_int, POINTER(c_ubyte), c_int, c_void_p) #first is return type
+        CMPFUNCRAW = WINFUNCTYPE(None, POINTER(c_ubyte), c_int, c_int, c_void_p)
 else:
-        CMPFUNC = CFUNCTYPE(c_void_p, c_int, c_int, POINTER(c_ubyte), c_int, c_void_p)
-        CMPFUNCRAW = CFUNCTYPE(c_void_p, POINTER(c_ubyte), c_int, c_int, c_void_p)
+        CMPFUNC = CFUNCTYPE(None, c_int, c_int, POINTER(c_ubyte), c_int, c_void_p)
+        CMPFUNCRAW = CFUNCTYPE(None, POINTER(c_ubyte), c_int, c_int, c_void_p)
 
 cmp_func = CMPFUNC(callbackfunction)

examples/python/sensors/sensorscallback.py

@@ -30 +30 @@
 
 if (platform.system() == 'Windows'):
-        CMPFUNC = WINFUNCTYPE(c_void_p, POINTER(c_ubyte), POINTER(c_ubyte), c_int, c_int, POINTER(c_ubyte), c_int, c_int, c_void_p) #first is return type
+        CMPFUNC = WINFUNCTYPE(None, POINTER(c_ubyte), POINTER(c_ubyte), c_int, c_int, POINTER(c_ubyte), c_int, c_int, c_void_p) #first is return type
 else:
-        CMPFUNC = CFUNCTYPE(c_void_p, POINTER(c_ubyte), POINTER(c_ubyte), c_int, c_int, POINTER(c_ubyte), c_int, c_int, c_void_p)
+        CMPFUNC = CFUNCTYPE(None, POINTER(c_ubyte), POINTER(c_ubyte), c_int, c_int, POINTER(c_ubyte), c_int, c_int, c_void_p)
 
 cmp_func = CMPFUNC(callbackfunction)