[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 517f7b7a4e93e0a781f7cd0e94b43d5bac10c390
Author: aCaB <acab at clamav.net>
Date:   Mon Oct 12 23:32:27 2009 +0200

    fmap, scanners.c: win32 fixes

diff --git a/libclamav/fmap.c b/libclamav/fmap.c
index 0400342..37204e5 100644
--- a/libclamav/fmap.c
+++ b/libclamav/fmap.c
@@ -27,7 +27,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #if HAVE_MMAP
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
@@ -123,7 +125,7 @@ fmap_t *fmap(int fd, off_t offset, size_t len) {
     } else {
 	dumb = 0;
 #if HAVE_MADVISE
-	madvise(m, mapsz, MADV_RANDOM|MADV_DONTFORK);
+	madvise((void *)m, mapsz, MADV_RANDOM|MADV_DONTFORK);
 #endif /* madvise */
     }
 #else /* ! HAVE_MMAP */
diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index e8d890b..6051081 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -22,7 +22,9 @@
 #include "clamav-config.h"
 #endif
 
+#ifndef _WIN32
 #include <sys/time.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -71,7 +73,7 @@
 #include "cab.h"
 #include "rtf.h"
 #include "unarj.h"
-#include "nulsft.h"
+#include "nsis/nulsft.h"
 #include "autoit.h"
 #include "textnorm.h"
 #include <zlib.h>

-- 
Debian repository for ClamAV