From d8696f98e7075c7d46b20db5a760b611bad073fa Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Tue, 24 Feb 2009 13:56:46 +0100
Subject: [PATCH] Fixed MAC OSX compile problems: forgot extern modifier at
various places.
---
src/lib-sieve/plugins/regex/ext-regex-common.h | 4 ++--
src/lib-sieve/plugins/relational/ext-relational-common.h | 2 +-
src/lib-sieve/sieve-address-parts.c | 2 +-
src/lib-sieve/sieve-address-parts.h | 4 ++--
src/lib-sieve/sieve-code.h | 6 +++---
src/lib-sieve/sieve-match-types.c | 2 +-
src/lib-sieve/sieve-match-types.h | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/lib-sieve/plugins/regex/ext-regex-common.h b/src/lib-sieve/plugins/regex/ext-regex-common.h
index 9a0452ecf..42462a7aa 100644
--- a/src/lib-sieve/plugins/regex/ext-regex-common.h
+++ b/src/lib-sieve/plugins/regex/ext-regex-common.h
@@ -8,13 +8,13 @@
* Extension
*/
-const struct sieve_extension regex_extension;
+extern const struct sieve_extension regex_extension;
/*
* Operand
*/
-const struct sieve_operand regex_match_type_operand;
+extern const struct sieve_operand regex_match_type_operand;
/*
* Match type
diff --git a/src/lib-sieve/plugins/relational/ext-relational-common.h b/src/lib-sieve/plugins/relational/ext-relational-common.h
index debd5428e..595726a41 100644
--- a/src/lib-sieve/plugins/relational/ext-relational-common.h
+++ b/src/lib-sieve/plugins/relational/ext-relational-common.h
@@ -39,7 +39,7 @@ enum relational_match {
* Extension definitions
*/
-int ext_relational_my_id;
+extern int ext_relational_my_id;
extern const struct sieve_extension relational_extension;
extern const struct sieve_match_type_extension relational_match_extension;
diff --git a/src/lib-sieve/sieve-address-parts.c b/src/lib-sieve/sieve-address-parts.c
index 9308c1896..24754b05e 100644
--- a/src/lib-sieve/sieve-address-parts.c
+++ b/src/lib-sieve/sieve-address-parts.c
@@ -187,7 +187,7 @@ static bool tag_address_part_generate
* Address-part operand
*/
-struct sieve_operand_class sieve_address_part_operand_class =
+const struct sieve_operand_class sieve_address_part_operand_class =
{ "address part" };
static const struct sieve_extension_objects core_address_parts =
diff --git a/src/lib-sieve/sieve-address-parts.h b/src/lib-sieve/sieve-address-parts.h
index 84540c853..ff340e437 100644
--- a/src/lib-sieve/sieve-address-parts.h
+++ b/src/lib-sieve/sieve-address-parts.h
@@ -64,8 +64,8 @@ const struct sieve_address_part *sieve_address_part_find
* Address part operand
*/
-const struct sieve_operand address_part_operand;
-struct sieve_operand_class sieve_address_part_operand_class;
+extern const struct sieve_operand address_part_operand;
+extern const struct sieve_operand_class sieve_address_part_operand_class;
#define SIEVE_EXT_DEFINE_ADDRESS_PART(OP) SIEVE_EXT_DEFINE_OBJECT(OP)
#define SIEVE_EXT_DEFINE_ADDRESS_PARTS(OPS) SIEVE_EXT_DEFINE_OBJECTS(OPS)
diff --git a/src/lib-sieve/sieve-code.h b/src/lib-sieve/sieve-code.h
index cfad35b06..db38e7d90 100644
--- a/src/lib-sieve/sieve-code.h
+++ b/src/lib-sieve/sieve-code.h
@@ -93,9 +93,9 @@ enum sieve_core_operand {
/* Operand classes */
-const struct sieve_operand_class number_class;
-const struct sieve_operand_class string_class;
-const struct sieve_operand_class stringlist_class;
+extern const struct sieve_operand_class number_class;
+extern const struct sieve_operand_class string_class;
+extern const struct sieve_operand_class stringlist_class;
/* Operand objects */
diff --git a/src/lib-sieve/sieve-match-types.c b/src/lib-sieve/sieve-match-types.c
index 6a5b33962..f07dd10a9 100644
--- a/src/lib-sieve/sieve-match-types.c
+++ b/src/lib-sieve/sieve-match-types.c
@@ -473,7 +473,7 @@ bool sieve_match_type_validate
* Match-type operand
*/
-struct sieve_operand_class sieve_match_type_operand_class =
+const struct sieve_operand_class sieve_match_type_operand_class =
{ "match type" };
static const struct sieve_extension_objects core_match_types =
diff --git a/src/lib-sieve/sieve-match-types.h b/src/lib-sieve/sieve-match-types.h
index ba073443d..aa7c51923 100644
--- a/src/lib-sieve/sieve-match-types.h
+++ b/src/lib-sieve/sieve-match-types.h
@@ -158,8 +158,8 @@ bool sieve_match_type_validate
* Match type operand
*/
-const struct sieve_operand match_type_operand;
-struct sieve_operand_class sieve_match_type_operand_class;
+extern const struct sieve_operand match_type_operand;
+extern const struct sieve_operand_class sieve_match_type_operand_class;
#define SIEVE_EXT_DEFINE_MATCH_TYPE(OP) SIEVE_EXT_DEFINE_OBJECT(OP)
#define SIEVE_EXT_DEFINE_MATCH_TYPES(OPS) SIEVE_EXT_DEFINE_OBJECTS(OPS)
--
GitLab