[gnumeric] Plugins: avoid using same variable name across plugins.



commit 3fc4ef8c7319c4c8be977f1dc7048591a04e3791
Author: Morten Welinder <terra gnome org>
Date:   Thu Jun 18 10:21:20 2015 -0400

    Plugins: avoid using same variable name across plugins.
    
    This works around a gcc/clang bug with the sanitizer.

 plugins/fn-christian-date/functions.c   |    2 +-
 plugins/fn-christian-date/plugin.xml.in |    2 +-
 plugins/fn-hebrew-date/functions.c      |    2 +-
 plugins/fn-hebrew-date/plugin.xml.in    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/fn-christian-date/functions.c b/plugins/fn-christian-date/functions.c
index 5745a4f..f1c239d 100644
--- a/plugins/fn-christian-date/functions.c
+++ b/plugins/fn-christian-date/functions.c
@@ -236,7 +236,7 @@ gnumeric_ascensionthursday (GnmFuncEvalInfo * ei, GnmValue const * const *argv)
 
 /***************************************************************************/
 
-GnmFuncDescriptor const datetime_functions[] = {
+GnmFuncDescriptor const christian_datetime_functions[] = {
        {"ascensionthursday", "|f", help_ascensionthursday,
         gnumeric_ascensionthursday, NULL, NULL, NULL,
         GNM_FUNC_VOLATILE + GNM_FUNC_AUTO_DATE,
diff --git a/plugins/fn-christian-date/plugin.xml.in b/plugins/fn-christian-date/plugin.xml.in
index 998d733..7583f9c 100644
--- a/plugins/fn-christian-date/plugin.xml.in
+++ b/plugins/fn-christian-date/plugin.xml.in
@@ -8,7 +8,7 @@
                <attribute name="module_file" value="plugin"/>
        </loader>
        <services>
-               <service type="function_group" id="datetime">
+               <service type="function_group" id="christian_datetime">
                        <_category>Date/Time</_category>
                        <functions textdomain="gnumeric-VERSION-functions">
                                <function name="eastersunday"/>
diff --git a/plugins/fn-hebrew-date/functions.c b/plugins/fn-hebrew-date/functions.c
index 211435b..bcd2380 100644
--- a/plugins/fn-hebrew-date/functions.c
+++ b/plugins/fn-hebrew-date/functions.c
@@ -364,7 +364,7 @@ gnumeric_date2julian (GnmFuncEvalInfo * ei, GnmValue const * const *argv)
 
 /***************************************************************************/
 
-GnmFuncDescriptor const datetime_functions[] = {
+GnmFuncDescriptor const hebrew_datetime_functions[] = {
        {"hdate", "|fff", help_hdate,
         gnumeric_hdate, NULL, NULL, NULL,
         GNM_FUNC_SIMPLE + GNM_FUNC_AUTO_UNITLESS,
diff --git a/plugins/fn-hebrew-date/plugin.xml.in b/plugins/fn-hebrew-date/plugin.xml.in
index 030936a..23bd15c 100644
--- a/plugins/fn-hebrew-date/plugin.xml.in
+++ b/plugins/fn-hebrew-date/plugin.xml.in
@@ -8,7 +8,7 @@
                <attribute name="module_file" value="plugin"/>
        </loader>
        <services>
-               <service type="function_group" id="datetime">
+               <service type="function_group" id="hebrew_datetime">
                        <_category>Date/Time</_category>
                        <functions textdomain="gnumeric-VERSION-functions">
                                <function name="hdate"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]