[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:18:16 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit cf3dc57d170eaee02a10be9f2a4b788b47f2a5da
Author: Török Edvin <edwin at clamav.net>
Date: Sat Jan 30 18:31:07 2010 +0200
fix ETIMEDOUT mismatch on win32.
Must include pthread.h in w32_errno.h.
ETIMEDOUT is not defined in any win32 system header!
So everybody defines it as they like, pthreads defines it to 10060,
we define it to 1110 (unless already defined).
So just include pthread.h to make sure we agree on its value.
Otherwise clamd will just infloop instead of timing out idle threads.
Also update project include paths so every proj can find pthread.h
diff --git a/win32/compat/w32_errno.h b/win32/compat/w32_errno.h
index 0aae28f..e220626 100644
--- a/win32/compat/w32_errno.h
+++ b/win32/compat/w32_errno.h
@@ -22,6 +22,9 @@
#define __W32_ERRNO_H
#include <errno.h>
+// Make sure ETIMEDOUT matches with pthread's notion of ETIMEDOUT,
+// otherwise we get a mismatch (10060 vs 1110)
+#include <pthread.h>
#include "w32_errno_defs.c"
char *w32_strerror(int errnum);
diff --git a/win32/libclamavcxx.vcproj b/win32/libclamavcxx.vcproj
index 5c0c517..d53e117 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)..""
- 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""
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)..""
- 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""
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,8 +149,8 @@
</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
diff --git a/win32/libclamunrar.vcproj b/win32/libclamunrar.vcproj
index e7c11d7..7c77f28 100644
--- a/win32/libclamunrar.vcproj
+++ b/win32/libclamunrar.vcproj
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
- Keyword="Win32Proj"
+ ProjectType="Visual C++"
+ Version="9.00"
Name="libclamunrar"
ProjectGUID="{41B2E193-92E3-429C-8DAC-9B287E3D7182}"
- ProjectType="Visual C++"
RootNamespace="libclamunrar"
+ Keyword="Win32Proj"
TargetFrameworkVersion="196613"
- Version="9,00"
>
<Platforms>
<Platform
@@ -17,11 +17,11 @@
</ToolFiles>
<Configurations>
<Configuration
- CharacterSet="2"
- ConfigurationType="2"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -39,18 +39,18 @@
Name="VCMIDLTool"
/>
<Tool
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..""
- BasicRuntimeChecks="3"
- CompileAs="1"
- DebugInformationFormat="3"
- DisableSpecificWarnings="4996;4244;4018;4146"
- MinimalRebuild="true"
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="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"
+ CompileAs="1"
+ DisableSpecificWarnings="4996;4244;4018;4146"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -62,10 +62,10 @@
Name="VCPreLinkEventTool"
/>
<Tool
- GenerateDebugInformation="true"
+ Name="VCLinkerTool"
LinkIncremental="1"
ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
- Name="VCLinkerTool"
+ GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
/>
@@ -92,11 +92,11 @@
/>
</Configuration>
<Configuration
- CharacterSet="2"
- ConfigurationType="2"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -115,19 +115,19 @@
Name="VCMIDLTool"
/>
<Tool
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..""
- BufferSecurityCheck="false"
- CompileAs="1"
- DebugInformationFormat="3"
- DisableSpecificWarnings="4996;4244;4018;4146"
- EnableFunctionLevelLinking="true"
- EnableIntrinsicFunctions="true"
Name="VCCLCompilerTool"
Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ DisableSpecificWarnings="4996;4244;4018;4146"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -139,13 +139,13 @@
Name="VCPreLinkEventTool"
/>
<Tool
- EnableCOMDATFolding="2"
- GenerateDebugInformation="true"
+ Name="VCLinkerTool"
LinkIncremental="1"
ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
- Name="VCLinkerTool"
- OptimizeReferences="2"
+ GenerateDebugInformation="true"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
@@ -175,8 +175,8 @@
</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
@@ -213,14 +213,14 @@
</File>
</Filter>
<Filter
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
diff --git a/win32/libclamunrar_iface.vcproj b/win32/libclamunrar_iface.vcproj
index aa5b0ac..602d374 100644
--- a/win32/libclamunrar_iface.vcproj
+++ b/win32/libclamunrar_iface.vcproj
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
- Keyword="Win32Proj"
+ ProjectType="Visual C++"
+ Version="9.00"
Name="libclamunrar_iface"
ProjectGUID="{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}"
- ProjectType="Visual C++"
RootNamespace="libclamunrar_iface"
+ Keyword="Win32Proj"
TargetFrameworkVersion="196613"
- Version="9,00"
>
<Platforms>
<Platform
@@ -17,11 +17,11 @@
</ToolFiles>
<Configurations>
<Configuration
- CharacterSet="2"
- ConfigurationType="2"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -39,18 +39,18 @@
Name="VCMIDLTool"
/>
<Tool
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..""
- BasicRuntimeChecks="3"
- CompileAs="1"
- DebugInformationFormat="3"
- DisableSpecificWarnings="4996"
- MinimalRebuild="true"
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="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"
+ CompileAs="1"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -62,10 +62,10 @@
Name="VCPreLinkEventTool"
/>
<Tool
- GenerateDebugInformation="true"
+ Name="VCLinkerTool"
LinkIncremental="1"
ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
- Name="VCLinkerTool"
+ GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
/>
@@ -92,11 +92,11 @@
/>
</Configuration>
<Configuration
- CharacterSet="2"
- ConfigurationType="2"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -115,19 +115,19 @@
Name="VCMIDLTool"
/>
<Tool
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..""
- BufferSecurityCheck="false"
- CompileAs="1"
- DebugInformationFormat="3"
- DisableSpecificWarnings="4996"
- EnableFunctionLevelLinking="true"
- EnableIntrinsicFunctions="true"
Name="VCCLCompilerTool"
Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -139,13 +139,13 @@
Name="VCPreLinkEventTool"
/>
<Tool
- EnableCOMDATFolding="2"
- GenerateDebugInformation="true"
+ Name="VCLinkerTool"
LinkIncremental="1"
ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
- Name="VCLinkerTool"
- OptimizeReferences="2"
+ GenerateDebugInformation="true"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
@@ -175,8 +175,8 @@
</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
@@ -193,14 +193,14 @@
</Filter>
</Filter>
<Filter
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list