Browse code

fix some includes

git-svn: trunk@2651

Tomasz Kojm authored on 2007/01/31 03:29:22
Showing 8 changed files
... ...
@@ -37,7 +37,7 @@
37 37
 #include <unistd.h>
38 38
 #include <sys/types.h>
39 39
 #include <signal.h>
40
-#include <clamav.h>
40
+#include "clamav.h"
41 41
 #include <errno.h>
42 42
 
43 43
 #include "defaults.h"
... ...
@@ -20,7 +20,7 @@
20 20
 #ifndef __MANAGER_H
21 21
 #define __MANAGER_H
22 22
 
23
-#include <clamav.h>
23
+#include "libclamav/clamav.h"
24 24
 #include <pwd.h>
25 25
 #include "options.h"
26 26
 
... ...
@@ -21,7 +21,7 @@
21 21
 #define __TREEWALK_H
22 22
 
23 23
 #include <pwd.h>
24
-#include <clamav.h>
24
+#include "libclamav/clamav.h"
25 25
 
26 26
 #include "options.h"
27 27
 
... ...
@@ -38,7 +38,6 @@
38 38
 #include <time.h>
39 39
 #include <fcntl.h>
40 40
 #include <sys/stat.h>
41
-#include <clamav.h>
42 41
 #include <errno.h>
43 42
 
44 43
 #include "defaults.h"
... ...
@@ -56,6 +55,7 @@
56 56
 #include "shared/memory.h"
57 57
 #include "shared/cdiff.h"
58 58
 
59
+#include "libclamav/clamav.h"
59 60
 #include "libclamav/others.h"
60 61
 #include "libclamav/str.h"
61 62
 #include "libclamav/cvd.h"
... ...
@@ -35,10 +35,10 @@
35 35
 #include <time.h>
36 36
 #include <fcntl.h>
37 37
 #include <sys/stat.h>
38
-#include <clamav.h>
39 38
 #include <errno.h>
40 39
 
41 40
 #include "shared/output.h"
41
+#include "libclamav/clamav.h"
42 42
 
43 43
 #ifdef SO_ERROR
44 44
 
... ...
@@ -19,6 +19,9 @@
19 19
  *  MA 02110-1301, USA.
20 20
  *
21 21
  *  $Log: phishcheck.c,v $
22
+ *  Revision 1.20  2007/01/30 18:29:21  tkojm
23
+ *  fix some includes
24
+ *
22 25
  *  Revision 1.19  2007/01/13 19:39:21  tkojm
23 26
  *  phishing fixes (bb#157)
24 27
  *
... ...
@@ -155,7 +158,7 @@ case CL_PHISH_HOST_NOT_LISTED:
155 155
 #endif
156 156
 #include <ctype.h>
157 157
 #include <limits.h>
158
-#include <clamav.h>
158
+#include "clamav.h"
159 159
 #ifndef	C_WINDOWS
160 160
 #include <netdb.h>
161 161
 #include <netinet/in.h>
... ...
@@ -36,7 +36,6 @@
36 36
 #include <sys/un.h>
37 37
 #include <netinet/in.h>
38 38
 #include <arpa/inet.h>
39
-#include <clamav.h>
40 39
 #include <sys/wait.h>
41 40
 #include <dirent.h>
42 41
 
... ...
@@ -53,6 +52,7 @@
53 53
 #include "shared/misc.h"
54 54
 #include "shared/cdiff.h"
55 55
 
56
+#include "libclamav/clamav.h"
56 57
 #include "libclamav/cvd.h"
57 58
 #include "libclamav/others.h"
58 59
 #include "libclamav/str.h"
... ...
@@ -25,13 +25,13 @@
25 25
 #include <sys/stat.h>
26 26
 #include <fcntl.h>
27 27
 #include <dirent.h>
28
-#include <clamav.h>
29 28
 #include <ctype.h>
30 29
 
31
-#include "../libclamav/vba_extract.h"
32
-#include "../libclamav/others.h"
33
-#include "../libclamav/cltypes.h"
34
-#include "../libclamav/ole2_extract.h"
30
+#include "libclamav/clamav.h"
31
+#include "libclamav/vba_extract.h"
32
+#include "libclamav/others.h"
33
+#include "libclamav/cltypes.h"
34
+#include "libclamav/ole2_extract.h"
35 35
 
36 36
 typedef struct mac_token_tag
37 37
 {