[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
Török Edvin
edwin at clamav.net
Sun Apr 4 01:21:04 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit fe8b10a52dc95c8bd688ba1864147d5e07766d85
Author: Török Edvin <edwin at clamav.net>
Date: Mon Feb 15 21:52:29 2010 +0200
fix win32 build.
diff --git a/clambc/bcrun.c b/clambc/bcrun.c
index 14ebef5..837e79c 100644
--- a/clambc/bcrun.c
+++ b/clambc/bcrun.c
@@ -123,7 +123,7 @@ static void tracehook_ptr(struct cli_bc_ctx *ctx, const void *ptr)
fprintf(stderr, "[trace] %p\n", ptr);
}
-extern uint8_t cli_debug_flag;
+static uint8_t cli_debug_flag=0;
static void print_src(const char *file)
{
char buf[4096];
@@ -208,6 +208,7 @@ int main(int argc, char *argv[])
if (optget(opts,"debug")->enabled) {
cl_debug();
+ cli_debug_flag=1;
}
rc = cl_init(CL_INIT_DEFAULT);
if (rc != CL_SUCCESS) {
diff --git a/win32/libclamavcxx.vcproj b/win32/libclamavcxx.vcproj
index ad1d4de..6447838 100644
--- a/win32/libclamavcxx.vcproj
+++ b/win32/libclamavcxx.vcproj
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
- Keyword="Win32Proj"
+ ProjectType="Visual C++"
+ Version="9.00"
Name="libclamavcxx"
ProjectGUID="{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}"
- ProjectType="Visual C++"
RootNamespace="libclamavcxx"
+ Keyword="Win32Proj"
TargetFrameworkVersion="196613"
- Version="9.00"
>
<Platforms>
<Platform
@@ -17,11 +17,11 @@
</ToolFiles>
<Configurations>
<Configuration
- CharacterSet="1"
- ConfigurationType="4"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -39,17 +39,17 @@
Name="VCMIDLTool"
/>
<Tool
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
- BasicRuntimeChecks="3"
- DebugInformationFormat="3"
- DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
- MinimalRebuild="true"
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\zlib""
PreprocessorDefinitions="__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -80,11 +80,11 @@
/>
</Configuration>
<Configuration
- CharacterSet="1"
- ConfigurationType="4"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
@@ -103,18 +103,18 @@
Name="VCMIDLTool"
/>
<Tool
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
- DebugInformationFormat="0"
- DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
- EnableFunctionLevelLinking="false"
- EnableIntrinsicFunctions="true"
Name="VCCLCompilerTool"
Optimization="2"
+ EnableIntrinsicFunctions="true"
+ WholeProgramOptimization="false"
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\zlib""
PreprocessorDefinitions="NDEBUG;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
RuntimeLibrary="2"
+ EnableFunctionLevelLinking="false"
UsePrecompiledHeader="0"
WarningLevel="3"
- WholeProgramOptimization="false"
+ DebugInformationFormat="0"
+ DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -149,16 +149,16 @@
</References>
<Files>
<Filter
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\libclamav\c++\ClamBCRTChecks.cpp"
+ RelativePath="..\libclamav\c++\bytecode2llvm.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\bytecode2llvm.cpp"
+ RelativePath="..\libclamav\c++\ClamBCRTChecks.cpp"
>
</File>
</Filter>
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list