From 2ed6a1c8e0b3190af22ede8a9ef171eac9fc75cd Mon Sep 17 00:00:00 2001
From: Nigel Horne <njh@clamav.net>
Date: Wed, 19 Sep 2007 15:55:24 +0000
Subject: [PATCH] Use the OpenBSD version of regex

git-svn: trunk@3230
---
 .../clamAV/libclamav/libclamav.vcproj         | 159 +++++++-----------
 .../libclamav.vcproj.NJH.Nigel Horne.user     |  30 +---
 2 files changed, 60 insertions(+), 129 deletions(-)

diff --git a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj b/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj
index ba108ed3c..60d0d1f12 100644
--- a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj
+++ b/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)mspack&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\unrar&quot;;&quot;$(ProjectDir)nsis&quot;;&quot;$(ProjectDir)js&quot;;&quot;$(ProjectDir)pthread&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)mspack&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\unrar&quot;;&quot;$(ProjectDir)nsis&quot;;&quot;$(ProjectDir)pthread&quot;;&quot;$(ProjectDir)regex&quot;"
 				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_DEBUG"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -70,6 +70,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
 				ModuleDefinitionFile="$(InputDir)/libclamav.def"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 			/>
 			<Tool
@@ -123,7 +124,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)mspack&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\unrar&quot;;&quot;$(ProjectDir)nsis&quot;;&quot;$(ProjectDir)js&quot;;&quot;$(ProjectDir)pthread&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)mspack&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\unrar&quot;;&quot;$(ProjectDir)nsis&quot;;&quot;$(ProjectDir)pthread&quot;;&quot;$(ProjectDir)regex&quot;"
 				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -178,88 +179,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release no .net|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)mspack&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\unrar&quot;;&quot;$(ProjectDir)nsis&quot;;&quot;$(ProjectDir)js&quot;;&quot;$(ProjectDir)pthread&quot;"
-				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				DefaultCharIsUnsigned="false"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
-				CallingConvention="0"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				GenerateManifest="false"
-				ModuleDefinitionFile="$(InputDir)/libclamav.def"
-				SubSystem="2"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -320,14 +239,6 @@
 						WarningLevel="4"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release no .net|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\dconf.c"
@@ -465,10 +376,6 @@
 				RelativePath=".\rebuildpe.c"
 				>
 			</File>
-			<File
-				RelativePath=".\regex.c"
-				>
-			</File>
 			<File
 				RelativePath=".\regex_list.c"
 				>
@@ -525,6 +432,10 @@
 				RelativePath=".\tnef.c"
 				>
 			</File>
+			<File
+				RelativePath=".\unarj.c"
+				>
+			</File>
 			<File
 				RelativePath=".\unsp.c"
 				>
@@ -677,6 +588,30 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="regex"
+				>
+				<File
+					RelativePath=".\regex\regcomp.c"
+					>
+				</File>
+				<File
+					RelativePath=".\regex\regerror.c"
+					>
+				</File>
+				<File
+					RelativePath=".\regex\regexec.c"
+					>
+				</File>
+				<File
+					RelativePath=".\regex\regfree.c"
+					>
+				</File>
+				<File
+					RelativePath=".\regex\strlcpy.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -867,10 +802,6 @@
 				RelativePath=".\rebuildpe.h"
 				>
 			</File>
-			<File
-				RelativePath=".\regex.h"
-				>
-			</File>
 			<File
 				RelativePath=".\regex_list.h"
 				>
@@ -935,6 +866,10 @@
 				RelativePath=".\tnef.h"
 				>
 			</File>
+			<File
+				RelativePath=".\unarj.h"
+				>
+			</File>
 			<File
 				RelativePath=".\unsp.h"
 				>
@@ -1119,6 +1054,30 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="regex"
+				>
+				<File
+					RelativePath=".\regex\cclass.h"
+					>
+				</File>
+				<File
+					RelativePath=".\regex\cname.h"
+					>
+				</File>
+				<File
+					RelativePath=".\regex\regex.h"
+					>
+				</File>
+				<File
+					RelativePath=".\regex\regex2.h"
+					>
+				</File>
+				<File
+					RelativePath=".\regex\utils.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj.NJH.Nigel Horne.user
index 6079ea942..433bb3fd3 100644
--- a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj.NJH.Nigel Horne.user	
+++ b/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj.NJH.Nigel Horne.user	
@@ -12,7 +12,7 @@
 				Command="$(OutDir)\clamd.exe"
 				WorkingDirectory=""
 				CommandArguments="--temp=d: --debug"
-				Attach="false"
+				Attach="true"
 				DebuggerType="3"
 				Remote="1"
 				RemoteMachine="NJH"
@@ -61,33 +61,5 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release no .net|Win32"
-			>
-			<DebugSettings
-				Command="$(OutDir)\clamd.exe"
-				WorkingDirectory=""
-				CommandArguments="--temp=d: --debug"
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>