From b705e8d71252833cd16dd1a2c9495db082568956 Mon Sep 17 00:00:00 2001
From: aCaB <acab@clamav.net>
Date: Fri, 25 Sep 2009 15:16:21 +0200
Subject: [PATCH] merge win32 patches from sherpya

---
 ChangeLog           | 7 +++++++
 libclamav/special.c | 2 ++
 shared/misc.h       | 4 ----
 sigtool/vba.c       | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7510da1b5..8c01fe184 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 25 15:13:25 CEST 2009 (acab)
+------------------------------------
+ * sigtool/vba.c: s/cli_errmsg/logg/
+ * shared/misc.h: in_addr_t is now already declared
+ * libclamav/special.c: do not include netinet/in.h on win32
+ All the patches from Gianluigi Tiesi <sherpya*netfarm.it>
+
 Fri Sep 25 15:09:02 CEST 2009 (acab)
 ------------------------------------
  * clamav-milter/clamav.milter.c: remove debug printf
diff --git a/libclamav/special.c b/libclamav/special.c
index c71354207..1dbba75b8 100644
--- a/libclamav/special.c
+++ b/libclamav/special.c
@@ -30,7 +30,9 @@
 #endif
 #include <string.h>
 #include <ctype.h>
+#ifndef _WIN32
 #include <netinet/in.h>
+#endif
 #include "clamav.h"
 #include "others.h"
 #include "cltypes.h"
diff --git a/shared/misc.h b/shared/misc.h
index 87d1ee42b..61ef62e31 100644
--- a/shared/misc.h
+++ b/shared/misc.h
@@ -36,10 +36,6 @@
 # endif
 #endif
 
-#ifndef HAVE_IN_ADDR_T
-typedef unsigned        int     in_addr_t;
-#endif
-
 #include <limits.h>
 
 #ifndef PATH_MAX
diff --git a/sigtool/vba.c b/sigtool/vba.c
index 143c63746..f0edeb257 100644
--- a/sigtool/vba.c
+++ b/sigtool/vba.c
@@ -36,6 +36,7 @@
 #include "libclamav/others.h"
 #include "libclamav/cltypes.h"
 #include "libclamav/ole2_extract.h"
+#include "shared/output.h"
 
 typedef struct mac_token_tag
 {
@@ -1022,7 +1023,7 @@ static int sigtool_scandir (const char *dirname, int hex_output)
 	    }
 	}
     } else {
-	cli_errmsg ("Can't open directory %s.\n", dirname);
+	logg("!Can't open directory %s.\n", dirname);
 	return CL_EOPEN;
     }
 
@@ -1139,7 +1140,7 @@ int sigtool_vba_scandir (const char *dirname, int hex_output, struct uniq *U)
 	    }
 	}
     } else {
-	cli_errmsg ("ScanDir -> Can't open directory %s.\n", dirname);
+	logg("!ScanDir -> Can't open directory %s.\n", dirname);
 	return CL_EOPEN;
     }