merge win32 patches from sherpya

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

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"

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

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;
     }