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

     }

 }

@@ -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 ""

@@ -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=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""

 				DebugInformationFormat="3"

+				DisableSpecificWarnings="4996;4244"

 				EnableFunctionLevelLinking="true"

 				EnableIntrinsicFunctions="true"

 				Name="VCCLCompilerTool"

@@ -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"