From 97000769e467dbd67a44ce3eeeea6ad90e9344d6 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Tue, 10 Jul 2012 18:00:44 +0200 Subject: [PATCH] Rename major/minor to be compatible with OpenBSD Rename major/minor/rev to plugin_major/plugin_minor/plugin_rev to avoid a conflict with the major/minor macros in sys/types.h --- plugin.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugin.c b/plugin.c index 6e74e35..870b796 100644 --- a/plugin.c +++ b/plugin.c @@ -190,14 +190,14 @@ zathura_plugin_manager_load(zathura_plugin_manager_t* plugin_manager) } else { girara_info("successfully loaded plugin %s", path); - zathura_plugin_version_function_t major = NULL, minor = NULL, rev = NULL; - g_module_symbol(handle, PLUGIN_VERSION_MAJOR_FUNCTION, (gpointer*) &major); - g_module_symbol(handle, PLUGIN_VERSION_MINOR_FUNCTION, (gpointer*) &minor); - g_module_symbol(handle, PLUGIN_VERSION_REVISION_FUNCTION, (gpointer*) &rev); - if (major != NULL && minor != NULL && rev != NULL) { - plugin->version.major = major(); - plugin->version.minor = minor(); - plugin->version.rev = rev(); + zathura_plugin_version_function_t plugin_major = NULL, plugin_minor = NULL, plugin_rev = NULL; + g_module_symbol(handle, PLUGIN_VERSION_MAJOR_FUNCTION, (gpointer*) &plugin_major); + g_module_symbol(handle, PLUGIN_VERSION_MINOR_FUNCTION, (gpointer*) &plugin_minor); + g_module_symbol(handle, PLUGIN_VERSION_REVISION_FUNCTION, (gpointer*) &plugin_rev); + if (plugin_major != NULL && plugin_minor != NULL && plugin_rev != NULL) { + plugin->version.major = plugin_major(); + plugin->version.minor = plugin_minor(); + plugin->version.rev = plugin_rev(); girara_debug("plugin '%s': version %u.%u.%u", path, plugin->version.major, plugin->version.minor, plugin->version.rev);