summaryrefslogtreecommitdiff
path: root/camel
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2015-07-10 17:40:31 +0100
committerPhilip Withnall <philip.withnall@collabora.co.uk>2015-07-29 12:12:31 +0100
commitc75ca824403cb51b6c9bb79591fa1c0b8214550f (patch)
treeb3e85a0763575490bb2f4a4c2efd9534f10197fa /camel
parente34c32d867fe7eafc3b79a0c77f019b826fadcb1 (diff)
downloadevolution-data-server-c75ca824403cb51b6c9bb79591fa1c0b8214550f.tar.gz
Bug 752233 - sexp: Eliminate some global variables which broke static linkingglobal-variables
Compiling EDS with --disable-shared was broken due to several global variables being declared with the same names, and not being declared static. Fix that by eliminating the unused ones and making the rest static. https://bugzilla.gnome.org/show_bug.cgi?id=752233
Diffstat (limited to 'camel')
-rw-r--r--camel/camel-sexp.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/camel/camel-sexp.c b/camel/camel-sexp.c
index 1150a2cde..cc659f16c 100644
--- a/camel/camel-sexp.c
+++ b/camel/camel-sexp.c
@@ -908,7 +908,7 @@ parse_dump_term (CamelSExpTerm *term,
}
#endif
-const gchar *time_functions[] = {
+static const gchar *time_functions[] = {
"time-now",
"make-time",
"time-add-day",
@@ -978,8 +978,6 @@ static const struct {
{"completed-before?", unary_generator},
};
-const gint generators_count = sizeof (generators) / sizeof (generators[0]);
-
static gboolean
or_operator (gint argc,
CamelSExpResult **argv,
@@ -1062,8 +1060,6 @@ static const struct {
{"and", and_operator}
};
-const gint operators_count = sizeof (operators) / sizeof (operators[0]);
-
static CamelSOperatorFunc *
get_operator_function (const gchar *fname)
{