Updated VisualC++ 7 projects

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@124 74dad513-b988-da41-8d7b-12977e46ad98

8 files changed, 426 insertions, 194 deletions

diff --git a/pjlib/build/pjlib++-test.vcproj b/pjlib/build/pjlib++-test.vcproj
new file mode 100644
index 00000000..ed476783
--- /dev/null
+++ b/pjlib/build/pjlib++-test.vcproj
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.10"

+	Name="pjlib++_test"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\./output/pjlib++-test-i386-win32-vc7-debug"

+			IntermediateDirectory=".\./output/pjlib++-test-i386-win32-vc7-debug"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../include,../../pjlib-util/include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PJ_WIN32=1;PJ_M_I386=1"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile=".\./output/pjlib++-test-i386-win32-vc7-debug/pjlib++-test.pch"

+				AssemblerListingLocation=".\./output/pjlib++-test-i386-win32-vc7-debug/"

+				ObjectFile=".\./output/pjlib++-test-i386-win32-vc7-debug/"

+				ProgramDataBaseFileName=".\./output/pjlib++-test-i386-win32-vc7-debug/"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="4"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib"

+				OutputFile="../bin/pjlib++-test-i386-win32-vc7-debug.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\./output/pjlib++-test-i386-win32-vc7-debug/pjlib++-test-i386-win32-vc7-debug.pdb"

+				SubSystem="1"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\./output/pjlib++-test-i386-win32-vc7-debug/pjlib++-test.tlb"

+				HeaderFileName=""/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\./output/pjlib++-test-i386-win32-vc7-release"

+			IntermediateDirectory=".\./output/pjlib++-test-i386-win32-vc7-release"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../include,../../pjlib-util/include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PJ_WIN32=1;PJ_M_I386=1"

+				StringPooling="TRUE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile=".\./output/pjlib++-test-i386-win32-vc7-release/pjlib++-test.pch"

+				AssemblerListingLocation=".\./output/pjlib++-test-i386-win32-vc7-release/"

+				ObjectFile=".\./output/pjlib++-test-i386-win32-vc7-release/"

+				ProgramDataBaseFileName=".\./output/pjlib++-test-i386-win32-vc7-release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib"

+				OutputFile="../bin/pjlib++-test-i386-win32-vc7-release.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				ProgramDatabaseFile=".\./output/pjlib++-test-i386-win32-vc7-release/pjlib++-test-i386-win32-vc7-release.pdb"

+				SubSystem="1"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\./output/pjlib++-test-i386-win32-vc7-release/pjlib++-test.tlb"

+				HeaderFileName=""/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\src\pjlib++-test\main.cpp">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+						BrowseInformation="1"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/pjlib/build/pjlib++.dsp b/pjlib/build/pjlib++.dsp
index 0b1baea3..8e33e6e0 100644
--- a/pjlib/build/pjlib++.dsp
+++ b/pjlib/build/pjlib++.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"../lib/pjlibp_vc6s.lib"

+# ADD LIB32 /nologo /out:"../lib/pjlib++-i386-win32-vc6-release.lib"

 

 !ELSEIF  "$(CFG)" == "pjlib++ - Win32 Debug"

 

@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"../lib/pjlibp_vc6sd.lib"

+# ADD LIB32 /nologo /out:"../lib/pjlib++-i386-win32-vc6-debug.lib"

 

 !ENDIF 

 

diff --git a/pjlib/build/pjlib++.vcproj b/pjlib/build/pjlib++.vcproj
index 4c6967c9..9daab799 100644
--- a/pjlib/build/pjlib++.vcproj
+++ b/pjlib/build/pjlib++.vcproj
@@ -2,11 +2,9 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="pjlibpp"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider="">

+	Name="pjlib++"

+	SccProjectName="&quot;$/pjproject/pjlib/build&quot;, UIAAAAAA"

+	SccLocalPath=".">

 	<Platforms>

 		<Platform

 			Name="Win32"/>

@@ -14,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\output\pjlibpp-i386-win32-vc7-release"

-			IntermediateDirectory=".\output\pjlibpp-i386-win32-vc7-release"

+			OutputDirectory=".\output\pjlib++-i386-win32-vc7-release"

+			IntermediateDirectory=".\output\pjlib++-i386-win32-vc7-release"

 			ConfigurationType="4"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -24,15 +22,15 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../src"

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_I386"

+				AdditionalIncludeDirectories="../include,../../pjlib-util/include"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"

 				StringPooling="TRUE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="TRUE"

-				PrecompiledHeaderFile=".\output\pjlibpp-i386-win32-vc7-release/pjlibpp.pch"

-				AssemblerListingLocation=".\output\pjlibpp-i386-win32-vc7-release/"

-				ObjectFile=".\output\pjlibpp-i386-win32-vc7-release/"

-				ProgramDataBaseFileName=".\output\pjlibpp-i386-win32-vc7-release/"

+				PrecompiledHeaderFile=".\output\pjlib++-i386-win32-vc7-release/pjlib++.pch"

+				AssemblerListingLocation=".\output\pjlib++-i386-win32-vc7-release/"

+				ObjectFile=".\output\pjlib++-i386-win32-vc7-release/"

+				ProgramDataBaseFileName=".\output\pjlib++-i386-win32-vc7-release/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				CompileAs="0"/>

@@ -40,7 +38,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="../lib/pjlibp_vc6s.lib"

+				OutputFile="../lib/pjlib++-i386-win32-vc7-release.lib"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

 				Name="VCMIDLTool"/>

@@ -65,8 +63,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\output\pjlibpp-i386-win32-vc7-debug"

-			IntermediateDirectory=".\output\pjlibpp-i386-win32-vc7-debug"

+			OutputDirectory=".\output\pjlib++-i386-win32-vc7-debug"

+			IntermediateDirectory=".\output\pjlib++-i386-win32-vc7-debug"

 			ConfigurationType="4"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -74,14 +72,14 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../src"

-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_I386"

+				AdditionalIncludeDirectories="../include,../../pjlib-util/include"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\output\pjlibpp-i386-win32-vc7-debug/pjlibpp.pch"

-				AssemblerListingLocation=".\output\pjlibpp-i386-win32-vc7-debug/"

-				ObjectFile=".\output\pjlibpp-i386-win32-vc7-debug/"

-				ProgramDataBaseFileName=".\output\pjlibpp-i386-win32-vc7-debug/"

+				PrecompiledHeaderFile=".\output\pjlib++-i386-win32-vc7-debug/pjlib++.pch"

+				AssemblerListingLocation=".\output\pjlib++-i386-win32-vc7-debug/"

+				ObjectFile=".\output\pjlib++-i386-win32-vc7-debug/"

+				ProgramDataBaseFileName=".\output\pjlib++-i386-win32-vc7-debug/"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="4"

@@ -90,7 +88,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="../lib/pjlibp_vc6sd.lib"

+				OutputFile="../lib/pjlib++-i386-win32-vc7-debug.lib"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

 				Name="VCMIDLTool"/>

@@ -118,110 +116,49 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath="..\src\pj++\compiletest.cpp">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pj++\pj++.cpp">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pj++\proactor.cpp">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

 			Name="Header Files"

 			Filter="h;hpp;hxx;hm;inl">

 			<File

-				RelativePath="..\src\pj++\hash.hpp">

+				RelativePath="..\include\pj++\file.hpp">

+			</File>

+			<File

+				RelativePath="..\include\pj++\hash.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\ioqueue.hpp">

+				RelativePath="..\include\pj++\list.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\list.hpp">

+				RelativePath="..\include\pj++\lock.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\os.hpp">

+				RelativePath="..\include\pj++\os.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pjlib++.hpp">

+				RelativePath="..\include\pjlib++.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\pool.hpp">

+				RelativePath="..\include\pj++\pool.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\proactor.hpp">

+				RelativePath="..\include\pj++\proactor.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\scanner.hpp">

+				RelativePath="..\include\pj++\scanner.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\sock.hpp">

+				RelativePath="..\include\pj++\sock.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\string.hpp">

+				RelativePath="..\include\pj++\string.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\timer.hpp">

+				RelativePath="..\include\pj++\timer.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\tree.hpp">

+				RelativePath="..\include\pj++\tree.hpp">

 			</File>

 			<File

-				RelativePath="..\src\pj++\types.hpp">

+				RelativePath="..\include\pj++\types.hpp">

 			</File>

 		</Filter>

 	</Files>

diff --git a/pjlib/build/pjlib.sln b/pjlib/build/pjlib.sln
index 8cf16a51..ae820f6a 100644
--- a/pjlib/build/pjlib.sln
+++ b/pjlib/build/pjlib.sln
@@ -1,44 +1,72 @@
 Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib", "pjlib.vcproj", "{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib", "pjlib.vcproj", "{4A6465DC-D757-43F2-9180-60920E33522B}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_samples", "pjlib_samples.vcproj", "{07AD8099-71FF-4DA3-9078-EF787D88A494}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib++", "pjlib++.vcproj", "{D124EDDD-ED22-43C0-9DDC-279BDEE7DF61}"

 	ProjectSection(ProjectDependencies) = postProject

-		{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A} = {7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_test", "pjlib_test.vcproj", "{14E6C298-03F6-4125-8545-7FD5A34B8E5A}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib++_test", "pjlib++-test.vcproj", "{2B01F39B-FF97-46BF-9CC8-26E3246ACA0E}"

 	ProjectSection(ProjectDependencies) = postProject

-		{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A} = {7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}

+		{4A6465DC-D757-43F2-9180-60920E33522B} = {4A6465DC-D757-43F2-9180-60920E33522B}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlibpp", "pjlibpp.vcproj", "{7BB69569-F8F5-41AB-95BB-9E3AA3A0CAB4}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_samples", "pjlib_samples.vcproj", "{C1B9C84B-CE30-45D7-A322-986786CE29D5}"

 	ProjectSection(ProjectDependencies) = postProject

+		{4A6465DC-D757-43F2-9180-60920E33522B} = {4A6465DC-D757-43F2-9180-60920E33522B}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_test", "pjlib_test.vcproj", "{0F28531A-FE4A-4E40-9C7F-763316CA5C9C}"

+	ProjectSection(ProjectDependencies) = postProject

+		{4A6465DC-D757-43F2-9180-60920E33522B} = {4A6465DC-D757-43F2-9180-60920E33522B}

 	EndProjectSection

 EndProject

 Global

+	GlobalSection(SourceCodeControl) = preSolution

+		SccNumberOfProjects = 4

+		SccProjectUniqueName0 = pjlib.vcproj

+		SccProjectName0 = \u0022$/pjproject/pjlib/build\u0022,\u0020UIAAAAAA

+		SccLocalPath0 = .

+		SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

+		SccProjectUniqueName1 = pjlib++.vcproj

+		SccProjectName1 = \u0022$/pjproject/pjlib/build\u0022,\u0020UIAAAAAA

+		SccLocalPath1 = .

+		SccProvider1 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

+		SccProjectUniqueName2 = pjlib_samples.vcproj

+		SccProjectName2 = \u0022$/pjproject-0.3/pjlib/build\u0022,\u0020EJDAAAAA

+		SccLocalPath2 = .

+		SccProvider2 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

+		SccProjectUniqueName3 = pjlib_test.vcproj

+		SccProjectName3 = \u0022$/pjproject/pjlib/build\u0022,\u0020UIAAAAAA

+		SccLocalPath3 = .

+		SccProvider3 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

+	EndGlobalSection

 	GlobalSection(SolutionConfiguration) = preSolution

 		Debug = Debug

 		Release = Release

 	EndGlobalSection

 	GlobalSection(ProjectConfiguration) = postSolution

-		{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}.Debug.ActiveCfg = Debug|Win32

-		{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}.Debug.Build.0 = Debug|Win32

-		{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}.Release.ActiveCfg = Release|Win32

-		{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}.Release.Build.0 = Release|Win32

-		{07AD8099-71FF-4DA3-9078-EF787D88A494}.Debug.ActiveCfg = Debug|Win32

-		{07AD8099-71FF-4DA3-9078-EF787D88A494}.Debug.Build.0 = Debug|Win32

-		{07AD8099-71FF-4DA3-9078-EF787D88A494}.Release.ActiveCfg = Release|Win32

-		{07AD8099-71FF-4DA3-9078-EF787D88A494}.Release.Build.0 = Release|Win32

-		{14E6C298-03F6-4125-8545-7FD5A34B8E5A}.Debug.ActiveCfg = Debug|Win32

-		{14E6C298-03F6-4125-8545-7FD5A34B8E5A}.Debug.Build.0 = Debug|Win32

-		{14E6C298-03F6-4125-8545-7FD5A34B8E5A}.Release.ActiveCfg = Release|Win32

-		{14E6C298-03F6-4125-8545-7FD5A34B8E5A}.Release.Build.0 = Release|Win32

-		{7BB69569-F8F5-41AB-95BB-9E3AA3A0CAB4}.Debug.ActiveCfg = Debug|Win32

-		{7BB69569-F8F5-41AB-95BB-9E3AA3A0CAB4}.Debug.Build.0 = Debug|Win32

-		{7BB69569-F8F5-41AB-95BB-9E3AA3A0CAB4}.Release.ActiveCfg = Release|Win32

-		{7BB69569-F8F5-41AB-95BB-9E3AA3A0CAB4}.Release.Build.0 = Release|Win32

+		{4A6465DC-D757-43F2-9180-60920E33522B}.Debug.ActiveCfg = Debug|Win32

+		{4A6465DC-D757-43F2-9180-60920E33522B}.Debug.Build.0 = Debug|Win32

+		{4A6465DC-D757-43F2-9180-60920E33522B}.Release.ActiveCfg = Release|Win32

+		{4A6465DC-D757-43F2-9180-60920E33522B}.Release.Build.0 = Release|Win32

+		{D124EDDD-ED22-43C0-9DDC-279BDEE7DF61}.Debug.ActiveCfg = Debug|Win32

+		{D124EDDD-ED22-43C0-9DDC-279BDEE7DF61}.Debug.Build.0 = Debug|Win32

+		{D124EDDD-ED22-43C0-9DDC-279BDEE7DF61}.Release.ActiveCfg = Release|Win32

+		{D124EDDD-ED22-43C0-9DDC-279BDEE7DF61}.Release.Build.0 = Release|Win32

+		{2B01F39B-FF97-46BF-9CC8-26E3246ACA0E}.Debug.ActiveCfg = Debug|Win32

+		{2B01F39B-FF97-46BF-9CC8-26E3246ACA0E}.Debug.Build.0 = Debug|Win32

+		{2B01F39B-FF97-46BF-9CC8-26E3246ACA0E}.Release.ActiveCfg = Release|Win32

+		{2B01F39B-FF97-46BF-9CC8-26E3246ACA0E}.Release.Build.0 = Release|Win32

+		{C1B9C84B-CE30-45D7-A322-986786CE29D5}.Debug.ActiveCfg = Debug|Win32

+		{C1B9C84B-CE30-45D7-A322-986786CE29D5}.Debug.Build.0 = Debug|Win32

+		{C1B9C84B-CE30-45D7-A322-986786CE29D5}.Release.ActiveCfg = Release|Win32

+		{C1B9C84B-CE30-45D7-A322-986786CE29D5}.Release.Build.0 = Release|Win32

+		{0F28531A-FE4A-4E40-9C7F-763316CA5C9C}.Debug.ActiveCfg = Debug|Win32

+		{0F28531A-FE4A-4E40-9C7F-763316CA5C9C}.Debug.Build.0 = Debug|Win32

+		{0F28531A-FE4A-4E40-9C7F-763316CA5C9C}.Release.ActiveCfg = Release|Win32

+		{0F28531A-FE4A-4E40-9C7F-763316CA5C9C}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/pjlib/build/pjlib.vcproj b/pjlib/build/pjlib.vcproj
index 3acfbf5f..ad718226 100644
--- a/pjlib/build/pjlib.vcproj
+++ b/pjlib/build/pjlib.vcproj
@@ -3,10 +3,8 @@
 	ProjectType="Visual C++"

 	Version="7.10"

 	Name="pjlib"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider="">

+	SccProjectName="&quot;$/pjproject/pjlib/build&quot;, UIAAAAAA"

+	SccLocalPath=".">

 	<Platforms>

 		<Platform

 			Name="Win32"/>

@@ -74,7 +72,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

 				AdditionalIncludeDirectories="../include"

 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_I386"

 				StringPooling="TRUE"

@@ -190,6 +188,28 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pj\ctype.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+						BrowseInformation="1"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BrowseInformation="1"/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\pj\equeue_winnt.c">

 				<FileConfiguration

 					Name="Debug|Win32">

@@ -279,9 +299,71 @@
 			</File>

 			<File

 				RelativePath="..\src\pj\file_access_win32.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+						BrowseInformation="1"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BrowseInformation="1"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\pj\file_io_ansi.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+						BrowseInformation="1"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BrowseInformation="1"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\src\pj\file_io_win32.c">

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="TRUE">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+						BrowseInformation="1"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="TRUE">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BrowseInformation="1"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\src\pj\guid.c">

@@ -355,13 +437,22 @@
 					Name="Debug|Win32"

 					ExcludedFromBuild="TRUE">

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+						BrowseInformation="1"/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="TRUE">

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BrowseInformation="1"/>

 				</FileConfiguration>

 			</File>

 			<File

@@ -370,7 +461,8 @@
 			<File

 				RelativePath="..\src\pj\ioqueue_select.c">

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					ExcludedFromBuild="TRUE">

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

@@ -393,8 +485,7 @@
 			<File

 				RelativePath="..\src\pj\ioqueue_winnt.c">

 				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="TRUE">

+					Name="Debug|Win32">

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

@@ -881,36 +972,6 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\pj\file_access_unistd.c">

-					<FileConfiguration

-						Name="Debug|Win32"

-						ExcludedFromBuild="TRUE">

-						<Tool

-							Name="VCCLCompilerTool"/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|Win32"

-						ExcludedFromBuild="TRUE">

-						<Tool

-							Name="VCCLCompilerTool"/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pj\file_io_ansi.c">

-					<FileConfiguration

-						Name="Debug|Win32"

-						ExcludedFromBuild="TRUE">

-						<Tool

-							Name="VCCLCompilerTool"/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|Win32"

-						ExcludedFromBuild="TRUE">

-						<Tool

-							Name="VCCLCompilerTool"/>

-					</FileConfiguration>

-				</File>

-				<File

 					RelativePath="..\src\pj\guid_simple.c">

 					<FileConfiguration

 						Name="Debug|Win32"

@@ -983,21 +1044,6 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\pj\ioqueue_linux_kernel.c">

-					<FileConfiguration

-						Name="Debug|Win32"

-						ExcludedFromBuild="TRUE">

-						<Tool

-							Name="VCCLCompilerTool"/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|Win32"

-						ExcludedFromBuild="TRUE">

-						<Tool

-							Name="VCCLCompilerTool"/>

-					</FileConfiguration>

-				</File>

-				<File

 					RelativePath="..\src\pj\log_writer_printk.c">

 					<FileConfiguration

 						Name="Debug|Win32"

@@ -1384,6 +1430,9 @@
 					RelativePath="..\include\pj\compat\m_m68k.h">

 				</File>

 				<File

+					RelativePath="..\include\pj\compat\m_sparc.h">

+				</File>

+				<File

 					RelativePath="..\include\pj\compat\malloc.h">

 				</File>

 				<File

@@ -1396,6 +1445,9 @@
 					RelativePath="..\include\pj\compat\os_palmos.h">

 				</File>

 				<File

+					RelativePath="..\include\pj\compat\os_sunos.h">

+				</File>

+				<File

 					RelativePath="..\include\pj\compat\os_win32.h">

 				</File>

 				<File

diff --git a/pjlib/build/pjlib_samples.mak b/pjlib/build/pjlib_samples.mak
index 322cc212..9425d14b 100644
--- a/pjlib/build/pjlib_samples.mak
+++ b/pjlib/build/pjlib_samples.mak
@@ -1,4 +1,5 @@
-OUTDIR=.\output\pjlib-samples-i386-win32-vc6-$(MODE)
+
+OUTDIR=.\output\pjlib-samples-i386-win32-$(VC)-$(MODE)
 
 SRCDIR=../src/pjlib-samples
 
@@ -14,10 +15,10 @@ MODE_CFLAGS=/MT
 
 CFLAGS=/nologo /W4 $(MODE_CFLAGS) /DPJ_WIN32=1 /DPJ_M_I386=1 /I../include
 
-PJLIB=../lib/pjlib-i386-win32-vc6-$(MODE).lib
+PJLIB=../lib/pjlib-i386-win32-$(VC)-$(MODE).lib
 
 DEPEND=$(PJLIB)
-LIBS=netapi32.lib mswsock.lib ws2_32.lib ole32.lib
+LIBS=netapi32.lib mswsock.lib ws2_32.lib ole32.lib advapi32.lib
 CL=cl.exe
 
 all: "$(OUTDIR)" $(SAMPLES)
diff --git a/pjlib/build/pjlib_samples.vcproj b/pjlib/build/pjlib_samples.vcproj
index b7609283..7fddeef1 100644
--- a/pjlib/build/pjlib_samples.vcproj
+++ b/pjlib/build/pjlib_samples.vcproj
@@ -3,10 +3,10 @@
 	ProjectType="Visual C++"

 	Version="7.10"

 	Name="pjlib_samples"

-	SccProjectName=""

+	SccProjectName="&quot;$/pjproject-0.3/pjlib/build&quot;, EJDAAAAA"

 	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

+	SccLocalPath="."

+	SccProvider="MSSCCI:Microsoft Visual SourceSafe"

 	Keyword="MakeFileProj">

 	<Platforms>

 		<Platform

@@ -22,8 +22,8 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /nologo /f &quot;pjlib_samples.mak&quot; MODE=debug"

-				ReBuildCommandLine="nmake /nologo /f &quot;pjlib_samples.mak&quot; MODE=debug /a"

+				BuildCommandLine="nmake /nologo /f &quot;pjlib_samples.mak&quot; MODE=debug VC=vc7"

+				ReBuildCommandLine="nmake /nologo /f &quot;pjlib_samples.mak&quot; MODE=debug VC=vc7 /a"

 				Output="pjlib samples"/>

 		</Configuration>

 		<Configuration

@@ -35,8 +35,8 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /f &quot;pjlib_samples.mak&quot; MODE=release"

-				ReBuildCommandLine="nmake /f &quot;pjlib_samples.mak&quot; MODE=release /a"

+				BuildCommandLine="nmake /f &quot;pjlib_samples.mak&quot; MODE=release VC=vc7"

+				ReBuildCommandLine="nmake /f &quot;pjlib_samples.mak&quot; MODE=release VC=vc7 /a"

 				Output="pjlib samples"/>

 		</Configuration>

 	</Configurations>

diff --git a/pjlib/build/pjlib_test.vcproj b/pjlib/build/pjlib_test.vcproj
index 8fc0d8e8..8f5d6103 100644
--- a/pjlib/build/pjlib_test.vcproj
+++ b/pjlib/build/pjlib_test.vcproj
@@ -3,10 +3,8 @@
 	ProjectType="Visual C++"

 	Version="7.10"

 	Name="pjlib_test"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider="">

+	SccProjectName="&quot;$/pjproject/pjlib/build&quot;, UIAAAAAA"

+	SccLocalPath=".">

 	<Platforms>

 		<Platform

 			Name="Win32"/>

@@ -110,7 +108,6 @@
 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\output\pjlib-test-i386-win32-vc7-release/pjlib-test-i386-win32-vc7-release.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

@@ -257,6 +254,25 @@
 			</File>

 			<File

 				RelativePath="..\src\pjlib-test\file.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+						BrowseInformation="1"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BrowseInformation="1"/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\src\pjlib-test\ioq_perf.c">

@@ -723,6 +739,28 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pjlib-test\udp_echo_srv_ioqueue.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BasicRuntimeChecks="3"

+						BrowseInformation="1"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						AdditionalIncludeDirectories=""

+						PreprocessorDefinitions=""

+						BrowseInformation="1"/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\pjlib-test\udp_echo_srv_sync.c">

 				<FileConfiguration

 					Name="Debug|Win32">