[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 dfb9c279cc1413aa73946d9c412f548c9c4f9348
Author: aCaB <acab at clamav.net>
Date:   Thu Jan 28 02:06:10 2010 +0100

    win32: fix warnings

diff --git a/libclamav/pe_icons.c b/libclamav/pe_icons.c
index a35733a..9106df4 100644
--- a/libclamav/pe_icons.c
+++ b/libclamav/pe_icons.c
@@ -1420,11 +1420,11 @@ static int parseicon(icon_groupset *set, uint32_t rva, cli_ctx *ctx, struct cli_
 	i = matcher->icons[enginesize][x].group[0];
 	j = i % 64;
 	i /= 64;
-	if(!(set->v[0][i] & (1<<j))) continue;
+	if(!(set->v[0][i] & ((uint64_t)1<<j))) continue;
 	i = matcher->icons[enginesize][x].group[1];
 	j = i % 64;
 	i /= 64;
-	if(!(set->v[1][i] & (1<<j))) continue;
+	if(!(set->v[1][i] & ((uint64_t)1<<j))) continue;
 	
 	if(!metrics.ccount && !matcher->icons[enginesize][x].ccount) {
 	    /* BW matching */
@@ -1520,7 +1520,7 @@ void cli_icongroupset_add(const char *groupname, icon_groupset *set, unsigned in
     else {
 	j = i % 64;
 	i /= 64;
-	set->v[type][i] |= 1<<j;
+	set->v[type][i] |= (uint64_t)1<<j;
     }
 }
 
diff --git a/win32/clamav-config.h b/win32/clamav-config.h
index d6bff18..1d2a295 100644
--- a/win32/clamav-config.h
+++ b/win32/clamav-config.h
@@ -493,7 +493,7 @@
 /* #undef USE_SYSLOG */
 
 /* Version number of package */
-#define VERSION "devel-r5076-689-gb957384"
+#define VERSION "devel-r5076-703-g0222ee6"
 
 /* Version suffix for package */
 #define VERSION_SUFFIX ""
diff --git a/win32/clambc.vcproj b/win32/clambc.vcproj
index fc75f33..51d3603 100644
--- a/win32/clambc.vcproj
+++ b/win32/clambc.vcproj
@@ -6,7 +6,7 @@
 	ProjectType="Visual C++"
 	RootNamespace="clambc"
 	TargetFrameworkVersion="196613"
-	Version="9.00"
+	Version="9,00"
 	>
 	<Platforms>
 		<Platform
@@ -117,6 +117,7 @@
 			<Tool
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996;4244"
 				EnableFunctionLevelLinking="true"
 				EnableIntrinsicFunctions="true"
 				Name="VCCLCompilerTool"
diff --git a/win32/compat/net.c b/win32/compat/net.c
index 5acd5d7..73dc2d3 100644
--- a/win32/compat/net.c
+++ b/win32/compat/net.c
@@ -20,6 +20,10 @@
 
 #include <winsock2.h>
 #include <Ws2tcpip.h>
+/* #define W2K_DNSAAPI_COMPAT */
+#ifdef W2K_DNSAAPI_COMPAT
+#include <Wspiapi.h>
+#endif
 #include "net.h"
 #include "w32_errno.h"
 

-- 
Debian repository for ClamAV