From b242f3359be50fa3aa94c38dcb5a194b0d63e873 Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Sun, 26 Oct 2008 22:03:10 +0100 Subject: [PATCH] Fix/Wip: LUMIERA_PLUGIN definition There where some bugs slipped in (not yet tested code) removed the descriptor from the plugin itself, lets see if we can remove the acquire and release functions later too. Declare the plugin interface itself in its first experimental state --- src/backend/interface.h | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/backend/interface.h b/src/backend/interface.h index ef13e40e1..7b97fd82e 100644 --- a/src/backend/interface.h +++ b/src/backend/interface.h @@ -291,17 +291,15 @@ queryfunc (void) \ * lumiera uuid generator tool (to be written) over the source file to generate luid's automatically * @param ... list of LUMIERA_INTERFACE_DEFINE() for all interfaces this plugin provides. */ -#define LUMIERA_PLUGIN(descriptor, acquire, release, luid, ...) \ +#define LUMIERA_PLUGIN(acquire, release, luid, ...) \ LUMIERA_EXPORT(plugin_interfaces, __VA_ARGS__) \ -LUMIERA_INTERFACE_DEFINE (lumieraorg_plugin, 0, \ - lumieraorg_plugin_0, \ - NULL, \ - NULL, \ - NULL, \ - LUMIERA_INTERFACE_MAP (plugin_interfaces, plugin_interfaces, luid) \ - ) - - +LUMIERA_INTERFACE_INSTANCE (lumieraorg_plugin, 0, \ + lumieraorg_plugin, \ + NULL, \ + acquire, \ + release, \ + LUMIERA_INTERFACE_MAP (plugin_interfaces, luid, plugin_interfaces) \ + ); /** * create a handle for a interface (WIP) @@ -372,6 +370,15 @@ struct lumiera_interface_struct #endif }; + +/** + * Plugin interface + */ +LUMIERA_INTERFACE_DECLARE (lumieraorg_plugin, 0, + LUMIERA_INTERFACE_SLOT (LumieraInterface*, plugin_interfaces, (void)), +); + + /* API to handle interfaces */