From ec5cdf1b177009c4db1ee96f029801cb38ec7dc4 Mon Sep 17 00:00:00 2001 From: Palana Date: Wed, 1 Jan 2014 03:33:16 +0100 Subject: [PATCH] fix incompatible types warning in signal system --- libobs/callback/signal.c | 8 ++++---- libobs/callback/signal.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libobs/callback/signal.c b/libobs/callback/signal.c index a5d86afe3..41f78653e 100644 --- a/libobs/callback/signal.c +++ b/libobs/callback/signal.c @@ -20,7 +20,7 @@ #include "signal.h" struct signal_callback { - void (*callback)(calldata_t, void*); + signal_callback_t callback; void *data; }; @@ -60,7 +60,7 @@ static inline void signal_info_destroy(struct signal_info *si) } static inline size_t signal_get_callback_idx(struct signal_info *si, - void (*callback)(void*, calldata_t), void *data) + signal_callback_t callback, void *data) { for (size_t i = 0; i < si->callbacks.num; i++) { struct signal_callback *sc = si->callbacks.array+i; @@ -129,7 +129,7 @@ void signal_handler_destroy(signal_handler_t handler) } void signal_handler_connect(signal_handler_t handler, const char *signal, - void (*callback)(void*, calldata_t), void *data) + signal_callback_t callback, void *data) { struct signal_info *sig, *last; struct signal_callback cb_data = {callback, data}; @@ -174,7 +174,7 @@ static inline struct signal_info *getsignal_locked(signal_handler_t handler, } void signal_handler_disconnect(signal_handler_t handler, const char *signal, - void (*callback)(void*, calldata_t), void *data) + signal_callback_t callback, void *data) { struct signal_info *sig = getsignal_locked(handler, signal); size_t idx; diff --git a/libobs/callback/signal.h b/libobs/callback/signal.h index 33d28cfd1..89ee5f6d3 100644 --- a/libobs/callback/signal.h +++ b/libobs/callback/signal.h @@ -33,15 +33,15 @@ extern "C" { struct signal_handler; typedef struct signal_handler *signal_handler_t; +typedef void (*signal_callback_t)(void*, calldata_t); EXPORT signal_handler_t signal_handler_create(void); EXPORT void signal_handler_destroy(signal_handler_t handler); EXPORT void signal_handler_connect(signal_handler_t handler, const char *signal, - void (*callback)(void*, calldata_t), void *data); + signal_callback_t callback, void *data); EXPORT void signal_handler_disconnect(signal_handler_t handler, - const char *signal, void (*callback)(void*, calldata_t), - void *data); + const char *signal, signal_callback_t callback, void *data); EXPORT void signal_handler_signal(signal_handler_t handler, const char *signal, calldata_t params);