Merge branch 'hartmut-compile-warnings' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-compile-warnings

2014-09-19 17:34:48 +01:00
parent 24e16e97ed 25c5d1af25
commit 13ec9a4073
4 changed files with 10 additions and 10 deletions
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@ -1772,7 +1772,7 @@ int		rval = 1;
 * @return		Non-zero (true) if the callback was removed
 */
 int
-dcb_remove_callback(DCB *dcb, DCB_REASON reason, int (*callback)(struct dcb *, DCB_REASON), void *userdata)
+dcb_remove_callback(DCB *dcb, DCB_REASON reason, int (*callback)(struct dcb *, DCB_REASON, void *), void *userdata)
 {
 DCB_CALLBACK	*cb, *pcb = NULL;
 int		rval = 0;