* Fix build under CentOS 5 with old glib 2.12

* Fix build of rspamd with CMAKE_BINARY_DIR differs from CMAKE_SOURCE_DIR
Rework include style.

11 files changed, 36 insertions, 36 deletions

diff --git a/src/lua/lua_cdb.c b/src/lua/lua_cdb.c
index fbbc69359..7adfeeac5 100644
--- a/src/lua/lua_cdb.c
+++ b/src/lua/lua_cdb.c
@@ -22,7 +22,7 @@
  */
 
 #include "lua_common.h"
-#include "../cdb/cdb.h"
+#include "cdb/cdb.h"
 
 #define CDB_REFRESH_TIME 60
 
@@ -104,7 +104,7 @@ lua_cdb_lookup (lua_State *L)
 	const gchar                    *what;
 	gchar                          *value;
 	gsize                           vlen;
-	goffset                         vpos;
+	gint64                          vpos;
 
 	/*
 	 * XXX: this code is placed here because event_loop is called inside workers, so start
diff --git a/src/lua/lua_cfg_file.c b/src/lua/lua_cfg_file.c
index 8a3bc07aa..a7f023cb3 100644
--- a/src/lua/lua_cfg_file.c
+++ b/src/lua/lua_cfg_file.c
@@ -23,8 +23,8 @@
  */
 
 #include "lua_common.h"
-#include "../expressions.h"
-#include "../symbols_cache.h"
+#include "expressions.h"
+#include "symbols_cache.h"
 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
 #endif
diff --git a/src/lua/lua_classifier.c b/src/lua/lua_classifier.c
index 82fd4948d..3eb66e188 100644
--- a/src/lua/lua_classifier.c
+++ b/src/lua/lua_classifier.c
@@ -24,8 +24,8 @@
 
 
 #include "lua_common.h"
-#include "../cfg_file.h"
-#include "../classifiers/classifiers.h"
+#include "cfg_file.h"
+#include "classifiers/classifiers.h"
 
 /* Classifier methods */
 LUA_FUNCTION_DEF (classifier, register_pre_callback);
diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
index 05bea312c..1583ee8e3 100644
--- a/src/lua/lua_common.c
+++ b/src/lua/lua_common.c
@@ -23,7 +23,7 @@
  */
 
 #include "lua_common.h"
-#include "../expressions.h"
+#include "expressions.h"
 
 /* Lua module init function */
 #define MODULE_INIT_FUNC "module_init"
diff --git a/src/lua/lua_common.h b/src/lua/lua_common.h
index 3f3fc7a1d..26710c904 100644
--- a/src/lua/lua_common.h
+++ b/src/lua/lua_common.h
@@ -1,11 +1,11 @@
 #ifndef RSPAMD_LUA_H
 #define RSPAMD_LUA_H
 
-#include "../config.h"
+#include "config.h"
 #ifdef WITH_LUA
 
-#include "../main.h"
-#include "../cfg_file.h"
+#include "main.h"
+#include "cfg_file.h"
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index d67176f0f..d994d55aa 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -24,13 +24,13 @@
 
 
 #include "lua_common.h"
-#include "../expressions.h"
-#include "../map.h"
-#include "../message.h"
-#include "../radix.h"
-#include "../trie.h"
-#include "../classifiers/classifiers.h"
-#include "../cfg_xml.h"
+#include "expressions.h"
+#include "map.h"
+#include "message.h"
+#include "radix.h"
+#include "trie.h"
+#include "classifiers/classifiers.h"
+#include "cfg_xml.h"
 
 /* Config file methods */
 LUA_FUNCTION_DEF (config, get_module_opt);
diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c
index 99976c238..4942b45b4 100644
--- a/src/lua/lua_http.c
+++ b/src/lua/lua_http.c
@@ -22,8 +22,8 @@
  */
 
 #include "lua_common.h"
-#include "../buffer.h"
-#include "../dns.h"
+#include "buffer.h"
+#include "dns.h"
 
 #define MAX_HEADERS_SIZE 8192
 
diff --git a/src/lua/lua_message.c b/src/lua/lua_message.c
index 1026c3690..0dedb9068 100644
--- a/src/lua/lua_message.c
+++ b/src/lua/lua_message.c
@@ -24,7 +24,7 @@
 
 
 #include "lua_common.h"
-#include "../message.h"
+#include "message.h"
 
 #define LUA_GMIME_BRIDGE_GET(class, name, mime_class)									\
 static gint																				\
diff --git a/src/lua/lua_regexp.c b/src/lua/lua_regexp.c
index 7a0b3d0c3..100b106fe 100644
--- a/src/lua/lua_regexp.c
+++ b/src/lua/lua_regexp.c
@@ -22,7 +22,7 @@
  */
 
 #include "lua_common.h"
-#include "../expressions.h"
+#include "expressions.h"
 
 LUA_FUNCTION_DEF (regexp, create);
 LUA_FUNCTION_DEF (regexp, get_cached);
diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index f3fdc3bad..c08c88491 100644
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -24,20 +24,20 @@
 
 
 #include "lua_common.h"
-#include "../message.h"
-#include "../expressions.h"
-#include "../protocol.h"
-#include "../filter.h"
-#include "../dns.h"
-#include "../util.h"
-#include "../images.h"
-#include "../cfg_file.h"
-#include "../statfile.h"
-#include "../tokenizers/tokenizers.h"
-#include "../classifiers/classifiers.h"
-#include "../binlog.h"
-#include "../statfile_sync.h"
-#include "../diff.h"
+#include "message.h"
+#include "expressions.h"
+#include "protocol.h"
+#include "filter.h"
+#include "dns.h"
+#include "util.h"
+#include "images.h"
+#include "cfg_file.h"
+#include "statfile.h"
+#include "tokenizers/tokenizers.h"
+#include "classifiers/classifiers.h"
+#include "binlog.h"
+#include "statfile_sync.h"
+#include "diff.h"
 
 extern stat_file_t* get_statfile_by_symbol (statfile_pool_t *pool, struct classifier_config *ccf,
 		const gchar *symbol, struct statfile **st, gboolean try_create);
diff --git a/src/lua/lua_xmlrpc.c b/src/lua/lua_xmlrpc.c
index 4589405cc..6ef9be7e4 100644
--- a/src/lua/lua_xmlrpc.c
+++ b/src/lua/lua_xmlrpc.c
@@ -414,7 +414,7 @@ lua_xmlrpc_parse_reply (lua_State *L)
 		ud.param_count = 0;
 
 		ctx = g_markup_parse_context_new (&xmlrpc_parser,
-				G_MARKUP_TREAT_CDATA_AS_TEXT | G_MARKUP_PREFIX_ERROR_POSITION, &ud, NULL);
+				G_MARKUP_TREAT_CDATA_AS_TEXT, &ud, NULL);
 		res = g_markup_parse_context_parse (ctx, data, s, &err);
 
 		if (! res) {