[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 2d777de59d3e940e3b3d0334b273ac157dd85f89
Author: aCaB <acab at clamav.net>
Date:   Mon Oct 12 23:40:07 2009 +0200

    win32: add gettimeofday

diff --git a/ChangeLog b/ChangeLog
index 5bc35f5..b70701b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 12 23:39:30 CEST 2009 (acab)
+------------------------------------
+ * win32: libclamav compiles
+
 Mon Oct 12 23:33:32 CEST 2009 (acab)
 ------------------------------------
  * /win32: VC project file and 3rd party stuff
diff --git a/libclamav/7z.h b/win32/compat/gettimeofday.c
similarity index 73%
copy from libclamav/7z.h
copy to win32/compat/gettimeofday.c
index cdc11fd..78607cf 100644
--- a/libclamav/7z.h
+++ b/win32/compat/gettimeofday.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2009 Sourcefire, Inc.
  *
- *  Authors: aCaB
+ *  Authors: aCaB <acab at clamav.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,15 +18,19 @@
  *  MA 02110-1301, USA.
  */
 
-#ifndef __7Z_H
-#define __7Z_H
-
 #if HAVE_CONFIG_H
 #include "clamav-config.h"
 #endif
 
-#include "others.h"
-
-int cli_7unz (int, cli_ctx *);
+#include <sys/types.h>
+#include <sys/timeb.h>
+#include "gettimeofday.h"
 
-#endif
+int gettimeofday(struct timeval *tv, struct timezone *tz) {
+	struct _timeb t;
+
+	_ftime_s(&t);
+	tv->tv_sec = t.time;
+	tv->tv_usec = t.millitm * 1000;
+	return 0;
+}
\ No newline at end of file
diff --git a/libclamav/ishield.h b/win32/compat/gettimeofday.h
similarity index 81%
copy from libclamav/ishield.h
copy to win32/compat/gettimeofday.h
index 1d85fb0..15c47d8 100644
--- a/libclamav/ishield.h
+++ b/win32/compat/gettimeofday.h
@@ -18,12 +18,9 @@
  *  MA 02110-1301, USA.
  */
 
-#ifndef __ISHIELD_H
-#define __ISHIELD_H
+#ifndef __GETLOCALTIME_H
+#define __GETLOCALTIME_H
 
-#include "others.h"
+int gettimeofday(struct timeval *tv, struct timezone *tz);
 
-int cli_scanishield_msi(cli_ctx *ctx, off_t off);
-int cli_scanishield(cli_ctx *ctx, off_t off, size_t sz);
-
-#endif
+#endif /* __GETLOCALTIME_H */
\ No newline at end of file
diff --git a/win32/libclamav.vcproj b/win32/libclamav.vcproj
index 3acdb3c..4d0ec28 100644
--- a/win32/libclamav.vcproj
+++ b/win32/libclamav.vcproj
@@ -242,10 +242,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\compat\dirent.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\disasm.c"
 				>
 			</File>
@@ -306,10 +302,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\compat\ltdl.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\lzma_iface.c"
 				>
 			</File>
@@ -769,6 +761,22 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="compat"
+				>
+				<File
+					RelativePath=".\compat\dirent.c"
+					>
+				</File>
+				<File
+					RelativePath=".\compat\gettimeofday.c"
+					>
+				</File>
+				<File
+					RelativePath=".\compat\ltdl.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"

-- 
Debian repository for ClamAV