summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcebka@mailsupport.rambler.ru <cebka@mailsupport.rambler.ru>2008-09-16 15:47:40 +0400
committercebka@mailsupport.rambler.ru <cebka@mailsupport.rambler.ru>2008-09-16 15:47:40 +0400
commit9e442d87b2907ff011a80b8a795c6710b6665705 (patch)
treec109d7a754b40ec1b247df734990f6e9d586597f
parentfe7ebd5be9d1352f7a3727bfbfabb6453321e269 (diff)
downloadrspamd-9e442d87b2907ff011a80b8a795c6710b6665705.tar.gz
rspamd-9e442d87b2907ff011a80b8a795c6710b6665705.zip
* Fix include dependencies
-rw-r--r--cfg_file.h1
-rw-r--r--cfg_utils.c9
-rwxr-xr-xconfigure2
-rw-r--r--plugins/surbl.c1
-rw-r--r--test/rspamd_url_test.c2
-rw-r--r--url.c1
-rw-r--r--util.c6
-rw-r--r--utils/url_extracter.c1
8 files changed, 15 insertions, 8 deletions
diff --git a/cfg_file.h b/cfg_file.h
index ff4eeb0d7..5fe89cf6d 100644
--- a/cfg_file.h
+++ b/cfg_file.h
@@ -19,7 +19,6 @@
#include <glib.h>
#include "upstream.h"
#include "memcached.h"
-#include "main.h"
#define DEFAULT_BIND_PORT 768
#define MAX_MEMCACHED_SERVERS 48
diff --git a/cfg_utils.c b/cfg_utils.c
index 035980624..3339e2bd0 100644
--- a/cfg_utils.c
+++ b/cfg_utils.c
@@ -1,4 +1,5 @@
#include <sys/types.h>
+#include <sys/socket.h>
#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
@@ -11,16 +12,18 @@
#include <syslog.h>
#include <netdb.h>
#include <math.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
#include "config.h"
+#include "cfg_file.h"
+#include "main.h"
#ifndef HAVE_OWN_QUEUE_H
#include <sys/queue.h>
#else
#include "queue.h"
#endif
-#include "cfg_file.h"
-#include "memcached.h"
-
extern int yylineno;
extern char *yytext;
diff --git a/configure b/configure
index 9031313a9..ef2665501 100755
--- a/configure
+++ b/configure
@@ -180,7 +180,7 @@ check_include()
if [ $? -eq 0 ] ; then
echo "found"
echo "-> OK" >> config.log
- _CFLAG=`echo "HAVE_$INCLUDE" | sed -e 's/[./]/_/g' | tr '[:lower:]' '[:upper:]'`
+ _CFLAG=`echo "$INCLUDE" | sed -e 's/[./]/_/g' | tr '[:lower:]' '[:upper:]'`
have_opt $_CFLAG
cleanup
return 0
diff --git a/plugins/surbl.c b/plugins/surbl.c
index bcb5f38ba..b163a4f2f 100644
--- a/plugins/surbl.c
+++ b/plugins/surbl.c
@@ -13,6 +13,7 @@
#include <syslog.h>
#include <fcntl.h>
#include <stdlib.h>
+#include <string.h>
#include <evdns.h>
diff --git a/test/rspamd_url_test.c b/test/rspamd_url_test.c
index 0db5084bf..43545252d 100644
--- a/test/rspamd_url_test.c
+++ b/test/rspamd_url_test.c
@@ -9,7 +9,7 @@
#include <syslog.h>
#include <fcntl.h>
#include <stdlib.h>
-
+#include <string.h>
#include "../config.h"
#include "../main.h"
diff --git a/url.c b/url.c
index 9fc6ecc98..367aa7d6a 100644
--- a/url.c
+++ b/url.c
@@ -7,6 +7,7 @@
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netdb.h>
+#include <string.h>
#include "url.h"
#include "fstring.h"
diff --git a/util.c b/util.c
index ed6d18fb6..78ca58e5a 100644
--- a/util.c
+++ b/util.c
@@ -7,11 +7,13 @@
#include <netdb.h>
#include <errno.h>
#include <unistd.h>
+#include <stdarg.h>
+#include <sys/file.h>
+
+#include "config.h"
#ifdef HAVE_LIBUTIL_H
#include <libutil.h>
#endif
-#include <stdarg.h>
-#include <sys/file.h>
#include "util.h"
#include "cfg_file.h"
diff --git a/utils/url_extracter.c b/utils/url_extracter.c
index dc2138e6f..8cd8498df 100644
--- a/utils/url_extracter.c
+++ b/utils/url_extracter.c
@@ -9,6 +9,7 @@
#include <syslog.h>
#include <fcntl.h>
#include <stdlib.h>
+#include <string.h>
#include <gmime/gmime.h>