Remove G_INLINE_FUNC definitions as I misunderstood its purposes.

diff --git a/src/cfg_xml.c b/src/cfg_xml.c
index a631e26cd5a5890ebb9d3fd85a5ea9720a588e8a..5e0d69a4cc28d0791fd3a4f0b04d82aef3b2ebf5 100644 (file)
--- a/src/cfg_xml.c
+++ b/src/cfg_xml.c
@@ -690,7 +690,7 @@ worker_handle_bind (struct config_file *cfg, struct rspamd_xml_userdata *ctx, GH
        return TRUE;
 }
 
-G_INLINE_FUNC gboolean
+static inline gboolean
 check_action (const gchar *data, gint *result)
 {
        if (g_ascii_strncasecmp (data, "reject", sizeof ("reject") - 1) == 0) {

diff --git a/src/classifiers/bayes.c b/src/classifiers/bayes.c
index 7bc3fde54c9d84a7bc1737fd1da417d889b7114c..274f82ad0c6ec76fb2104fa77fbc4ef797a41758 100644 (file)
--- a/src/classifiers/bayes.c
+++ b/src/classifiers/bayes.c
@@ -36,7 +36,7 @@
 
 #define LOCAL_PROB_DENOM 16.0
 
-G_INLINE_FUNC GQuark
+static inline GQuark
 bayes_error_quark (void)
 {
        return g_quark_from_static_string ("bayes-error");

diff --git a/src/classifiers/winnow.c b/src/classifiers/winnow.c
index b7fe4e12300be4c7ac2807364f16d897b92cdf23..24ee7821cedcd7b6432e43e629fe085e618fa837 100644 (file)
--- a/src/classifiers/winnow.c
+++ b/src/classifiers/winnow.c
@@ -46,7 +46,7 @@
 
 #define MAX_LEARN_ITERATIONS 100
 
-G_INLINE_FUNC GQuark
+static inline GQuark
 winnow_error_quark (void)
 {
        return g_quark_from_static_string ("winnow-error");

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index c5adedcfe056b3852e0e6dd37bff95599034cfd3..2b19c45be0ca6718db2d83f78254cbb5130af32a 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -604,7 +604,7 @@ lua_task_get_images (lua_State *L)
        return 1;
 }
 
-G_INLINE_FUNC gboolean
+static inline gboolean
 lua_push_symbol_result (lua_State *L, struct worker_task *task, struct metric *metric, const gchar *symbol)
 {
        struct metric_result           *metric_res;

diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 1942d3c5aa811f257bc9a8e41cb0f2925be7345b..34b4cba5bf4febe71bc3619a495517b879897c86 100644 (file)
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -583,7 +583,7 @@ fuzzy_learn_callback (gint fd, short what, void *arg)
        remove_normal_event (session->session->s, fuzzy_learn_fin, session);
 }
 
-G_INLINE_FUNC void
+static inline void
 register_fuzzy_call (struct worker_task *task, fuzzy_hash_t *h)
 {
        struct fuzzy_client_session    *session;
@@ -701,7 +701,7 @@ fuzzy_symbol_callback (struct worker_task *task, void *unused)
        }
 }
 
-G_INLINE_FUNC gboolean
+static inline gboolean
 register_fuzzy_controller_call (struct controller_session *session, struct worker_task *task, fuzzy_hash_t *h,
                gint                            cmd, gint value, gint flag, gint *saved)
 {

diff --git a/src/protocol.c b/src/protocol.c
index 11f82bd47a29b41ca0674a01c04f25cc74ef020c..77043bdc073ec6aeb1cc4a5a4014d4126f73e5d0 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -92,7 +92,7 @@ static GList                   *custom_commands = NULL;
 /* For default metric, dirty hack, but much faster than hash lookup */
 static double default_score, default_required_score;
 
-G_INLINE_FUNC const gchar *
+static inline const gchar *
 rspamc_proto_str (guint ver)
 {
        if (ver >= 12) {

diff --git a/src/trie.c b/src/trie.c
index 03f600cdb11737440396cb253f0bd6f95206dfed..21743d85626e92189903971d148a1d9b82673289 100644 (file)
--- a/src/trie.c
+++ b/src/trie.c
@@ -85,7 +85,7 @@ rspamd_trie_insert_char (rspamd_trie_t *trie, gint depth, struct rspamd_trie_sta
        return q;
 }
 
-G_INLINE_FUNC struct rspamd_trie_match *
+static inline struct rspamd_trie_match *
 check_match (struct rspamd_trie_state *s, gchar c)
 {
        struct rspamd_trie_match         *m = s->match;

diff --git a/src/view.c b/src/view.c
index 3477b35ef00d3d523eb0649620fd149269032452..ec4bb10824684312d3f04342a28e7c1ce56e75ec 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -207,7 +207,7 @@ find_view_by_from (GList * views, struct worker_task *task)
        return NULL;
 }
 
-G_INLINE_FUNC gboolean
+static inline gboolean
 check_view_rcpt (struct rspamd_view *v, struct worker_task *task)
 {
        GList                          *cur, *cur_re;