From 7ca68a9d042f70268d7fbbd304e56a84dbe0ff1c Mon Sep 17 00:00:00 2001 From: Palana Date: Fri, 3 Jan 2014 02:58:17 +0100 Subject: [PATCH] fix function pointer types in dynamic procedure handler --- libobs/callback/proc.c | 4 ++-- libobs/callback/proc.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libobs/callback/proc.c b/libobs/callback/proc.c index 52e2ad83f..2a67c1e2e 100644 --- a/libobs/callback/proc.c +++ b/libobs/callback/proc.c @@ -21,7 +21,7 @@ struct proc_info { char *name; void *data; - void (*proc)(calldata_t, void*); + proc_handler_proc_t proc; }; static inline void proc_info_free(struct proc_info *pi) @@ -52,7 +52,7 @@ void proc_handler_destroy(proc_handler_t handler) } void proc_handler_add(proc_handler_t handler, const char *name, - void (*proc)(void*, calldata_t), void *data) + proc_handler_proc_t proc, void *data) { struct proc_info pi = {bstrdup(name), data, proc}; da_push_back(handler->procs, &pi); diff --git a/libobs/callback/proc.h b/libobs/callback/proc.h index 1bc1e17d1..6d227148d 100644 --- a/libobs/callback/proc.h +++ b/libobs/callback/proc.h @@ -34,12 +34,13 @@ extern "C" { struct proc_handler; typedef struct proc_handler *proc_handler_t; +typedef void (*proc_handler_proc_t)(void*, calldata_t); EXPORT proc_handler_t proc_handler_create(void); EXPORT void proc_handler_destroy(proc_handler_t handler); EXPORT void proc_handler_add(proc_handler_t handler, const char *name, - void (*proc)(void*, calldata_t), void *data); + proc_handler_proc_t proc, void *data); /** * Calls a function in a procedure handler. Returns false if the named -- GitLab