Index: /pjproject/main/pjlib/build/pjlib.sln
===================================================================
--- /pjproject/main/pjlib/build/pjlib.sln	(revision 5)
+++ /pjproject/main/pjlib/build/pjlib.sln	(revision 6)
@@ -1,38 +1,22 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib", "pjlib.vcproj", "{07A676B3-6E86-49E5-B20A-394A33B05B28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib", "pjlib.vcproj", "{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_test", "pjlib_test.vcproj", "{CF20BE3E-30FA-4A05-91F2-FF978F8705BF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_samples", "pjlib_samples.vcproj", "{07AD8099-71FF-4DA3-9078-EF787D88A494}"
 	ProjectSection(ProjectDependencies) = postProject
-		{07A676B3-6E86-49E5-B20A-394A33B05B28} = {07A676B3-6E86-49E5-B20A-394A33B05B28}
+		{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A} = {7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlibpp", "pjlibpp.vcproj", "{488B9CA1-8F59-4E4E-8748-D6A712CF9F3C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_test", "pjlib_test.vcproj", "{14E6C298-03F6-4125-8545-7FD5A34B8E5A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A} = {7BDE3EEB-E290-4E28-BCA2-7DC3F512AA8A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlibpp", "pjlibpp.vcproj", "{7BB69569-F8F5-41AB-95BB-9E3AA3A0CAB4}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(SourceCodeControl) = preSolution
-		SccNumberOfProjects = 4
-		SccProjectUniqueName0 = pjlib.vcproj
-		SccLocalPath0 = ..\\..
-		CanCheckoutShared = false
-		SccProjectFilePathRelativizedFromConnection0 = pjlib\\build\\
-		SccProjectName1 = \u0022$/pjproject\u0022,\u0020PIAAAAAA
-		SccLocalPath1 = ..\\..
-		SccProvider1 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
-		CanCheckoutShared = false
-		SccProjectFilePathRelativizedFromConnection1 = pjlib\\build\\
-		SolutionUniqueID = {9AAE883A-59C1-4404-A119-28ED201D7215}
-		SccProjectUniqueName2 = pjlib_test.vcproj
-		SccLocalPath2 = ..\\..
-		CanCheckoutShared = false
-		SccProjectFilePathRelativizedFromConnection2 = pjlib\\build\\
-		SccProjectUniqueName3 = pjlibpp.vcproj
-		SccLocalPath3 = ..\\..
-		CanCheckoutShared = false
-		SccProjectFilePathRelativizedFromConnection3 = pjlib\\build\\
-	EndGlobalSection
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -40,16 +24,20 @@
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{07A676B3-6E86-49E5-B20A-394A33B05B28}.Debug.ActiveCfg = Debug|Win32
-		{07A676B3-6E86-49E5-B20A-394A33B05B28}.Debug.Build.0 = Debug|Win32
-		{07A676B3-6E86-49E5-B20A-394A33B05B28}.Release.ActiveCfg = Release|Win32
-		{07A676B3-6E86-49E5-B20A-394A33B05B28}.Release.Build.0 = Release|Win32
-		{CF20BE3E-30FA-4A05-91F2-FF978F8705BF}.Debug.ActiveCfg = Debug|Win32
-		{CF20BE3E-30FA-4A05-91F2-FF978F8705BF}.Debug.Build.0 = Debug|Win32
-		{CF20BE3E-30FA-4A05-91F2-FF978F8705BF}.Release.ActiveCfg = Release|Win32
-		{CF20BE3E-30FA-4A05-91F2-FF978F8705BF}.Release.Build.0 = Release|Win32
-		{488B9CA1-8F59-4E4E-8748-D6A712CF9F3C}.Debug.ActiveCfg = Debug|Win32
-		{488B9CA1-8F59-4E4E-8748-D6A712CF9F3C}.Debug.Build.0 = Debug|Win32
-		{488B9CA1-8F59-4E4E-8748-D6A712CF9F3C}.Release.ActiveCfg = Release|Win32
-		{488B9CA1-8F59-4E4E-8748-D6A712CF9F3C}.Release.Build.0 = Release|Win32
+		{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
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
Index: /pjproject/main/pjlib/build/pjlib.vcproj
===================================================================
--- /pjproject/main/pjlib/build/pjlib.vcproj	(revision 5)
+++ /pjproject/main/pjlib/build/pjlib.vcproj	(revision 6)
@@ -4,9 +4,8 @@
 	Version="7.10"
 	Name="pjlib"
-	ProjectGUID="{72790D99-35BB-45AC-9A23-3BB60C901E63}"
-	SccProjectName="&quot;$/pjproject&quot;, PIAAAAAA"
+	SccProjectName=""
 	SccAuxPath=""
-	SccLocalPath="..\.."
-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">
+	SccLocalPath=""
+	SccProvider="">
 	<Platforms>
 		<Platform
@@ -16,6 +15,6 @@
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\output\pjlib_vc7_Debug"
-			IntermediateDirectory=".\output\pjlib_vc7_Debug"
+			OutputDirectory=".\output\pjlib-i386-win32-vc7-debug"
+			IntermediateDirectory=".\output\pjlib-i386-win32-vc7-debug"
 			ConfigurationType="4"
 			UseOfMFC="0"
@@ -25,12 +24,12 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_I386"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\output\pjlib_vc7_Debug/pjlib.pch"
-				AssemblerListingLocation=".\output\pjlib_vc7_Debug/"
-				ObjectFile=".\output\pjlib_vc7_Debug/"
-				ProgramDataBaseFileName=".\output\pjlib_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/"
 				BrowseInformation="1"
 				WarningLevel="4"
@@ -42,5 +41,5 @@
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\pjlib_vc7sd.lib"
+				OutputFile="../lib/pjlib-i386-win32-vc7-debug.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -67,6 +66,6 @@
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\output\pjlib_vc7_Release"
-			IntermediateDirectory=".\output\pjlib_vc7_Release"
+			OutputDirectory="\.output\pjlib-i386-win32-vc7-release"
+			IntermediateDirectory=".\output\pjlib-i386-win32-vc7-release"
 			ConfigurationType="4"
 			UseOfMFC="0"
@@ -77,14 +76,13 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_I386"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\output\pjlib_vc7_Release/pjlib.pch"
-				AssemblerListingLocation=".\output\pjlib_vc7_Release/"
-				ObjectFile=".\output\pjlib_vc7_Release/"
-				ProgramDataBaseFileName=".\output\pjlib_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/"
 				BrowseInformation="1"
 				WarningLevel="4"
@@ -96,5 +94,5 @@
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\pjlib_vc7s.lib"
+				OutputFile="../lib/pjlib-i386-win32-vc7-release.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -127,4 +125,26 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
+				RelativePath="..\src\pj\addr_resolv_sock.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\array.c">
 				<FileConfiguration
@@ -150,4 +170,67 @@
 			<File
 				RelativePath="..\src\pj\config.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">
+					<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\errno.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
@@ -218,4 +301,26 @@
 			</File>
 			<File
+				RelativePath="..\src\pj\guid_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\hash.c">
 				<FileConfiguration
@@ -252,5 +357,6 @@
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
 					<Tool
 						Name="VCCLCompilerTool"
@@ -263,4 +369,24 @@
 			<File
 				RelativePath="..\src\pj\ioqueue_winnt.c">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<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
@@ -287,4 +413,26 @@
 			</File>
 			<File
+				RelativePath="..\src\pj\lock.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\log.c">
 				<FileConfiguration
@@ -309,11 +457,156 @@
 			</File>
 			<File
-				RelativePath="..\src\pj\log_stdout.c">
+				RelativePath="..\src\pj\log_writer_stdout.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\md5.c">
-			</File>
-			<File
-				RelativePath="..\src\pj\os_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\os_core_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\os_error_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\os_time_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\os_timestamp_common.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\os_timestamp_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
@@ -341,4 +634,23 @@
 			<File
 				RelativePath="..\src\pj\pool_caching.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
@@ -365,5 +677,46 @@
 			</File>
 			<File
-				RelativePath="..\src\pj\pool_policy.c">
+				RelativePath="..\src\pj\pool_policy_malloc.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\rand.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
@@ -412,5 +765,27 @@
 			</File>
 			<File
-				RelativePath="..\src\pj\sock.c">
+				RelativePath="..\src\pj\sock_bsd.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\sock_select.c">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -457,7 +832,45 @@
 			<File
 				RelativePath="..\src\pj\stun.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\stun_client.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
@@ -507,5 +920,388 @@
 			<File
 				RelativePath="..\src\pj\xml.c">
-			</File>
+				<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>
+			<Filter
+				Name="Other Targets"
+				Filter="">
+				<File
+					RelativePath="..\src\pj\addr_resolv_linux_kernel.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_simple.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\ioqueue_dummy.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\ioqueue_epoll.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\log_writer_printk.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\os_core_linux_kernel.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\os_core_unix.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\os_error_linux_kernel.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\os_error_unix.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\os_time_linux_kernel.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\os_timestamp_linux.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\os_timestamp_linux_kernel.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\pool_policy_kmalloc.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\sock_linux_kernel.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\symbols.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>
+			</Filter>
 		</Filter>
 		<Filter
@@ -513,69 +1309,172 @@
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath="..\src\pj\array.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\compat.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\config.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\except.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\fifobuf.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\guid.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\hash.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\ioqueue.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\list.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\log.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\md5.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\os.h">
-			</File>
-			<File
-				RelativePath="..\src\pjlib.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\pool.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\rbtree.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\scanner.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\sock.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\string.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\stun.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\timer.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\types.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\xml.h">
-			</File>
+				RelativePath="..\include\pj\addr_resolv.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\array.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\assert.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\config.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\config_site.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\ctype.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\doxygen.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\equeue.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\errno.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\except.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\fifobuf.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\guid.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\hash.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\ioqueue.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\list.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\lock.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\log.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\md5.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\os.h">
+			</File>
+			<File
+				RelativePath="..\include\pjlib.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\pool.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\rand.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\rbtree.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\scanner.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\sock.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\sock_select.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\string.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\stun.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\timer.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\types.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\xml.h">
+			</File>
+			<Filter
+				Name="compat"
+				Filter="">
+				<File
+					RelativePath="..\include\pj\compat\assert.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\cc_gcc.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\cc_msvc.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\ctype.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\errno.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\high_precision.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\m_alpha.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\m_i386.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\m_m68k.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\malloc.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\os_linux.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\os_linux_kernel.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\os_palmos.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\os_win32.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\rand.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\setjmp.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\size_t.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\socket.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\sprintf.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\stdarg.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\stdfileio.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\string.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\time.h">
+				</File>
+				<File
+					RelativePath="..\include\pj\compat\vsprintf.h">
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
@@ -583,23 +1482,11 @@
 			Filter="">
 			<File
-				RelativePath="..\src\pj\array_i.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\list_i.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\pool_i.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\scanner_i.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\sock_i.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\string_i.h">
-			</File>
-			<File
-				RelativePath="..\src\pj\timer_i.h">
+				RelativePath="..\include\pj\list_i.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\pool_i.h">
+			</File>
+			<File
+				RelativePath="..\include\pj\string_i.h">
 			</File>
 		</Filter>
Index: /pjproject/main/pjlib/build/pjlib_samples.vcproj
===================================================================
--- /pjproject/main/pjlib/build/pjlib_samples.vcproj	(revision 6)
+++ /pjproject/main/pjlib/build/pjlib_samples.vcproj	(revision 6)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="pjlib_samples"
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider=""
+	Keyword="MakeFileProj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\./output/pjlib-samples-i386-win32-vc7-debug"
+			IntermediateDirectory=".\./output/pjlib-samples-i386-win32-vc7-debug"
+			ConfigurationType="0"
+			UseOfMFC="0"
+			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"
+				Output="pjlib samples"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\./output/pjlib-samples-i386-win32-vc7-release"
+			IntermediateDirectory=".\./output/pjlib-samples-i386-win32-vc7-release"
+			ConfigurationType="0"
+			UseOfMFC="0"
+			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"
+				Output="pjlib samples"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\src\pjlib-samples\except.c">
+			</File>
+			<File
+				RelativePath="..\src\pjlib-samples\list.c">
+			</File>
+			<File
+				RelativePath="..\src\pjlib-samples\log.c">
+			</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>
+		<File
+			RelativePath="pjlib_samples.mak">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
Index: /pjproject/main/pjlib/build/pjlib_test.vcproj
===================================================================
--- /pjproject/main/pjlib/build/pjlib_test.vcproj	(revision 5)
+++ /pjproject/main/pjlib/build/pjlib_test.vcproj	(revision 6)
@@ -4,9 +4,8 @@
 	Version="7.10"
 	Name="pjlib_test"
-	ProjectGUID="{A684A4C0-00D6-4497-B144-FC6AED4FAD8A}"
-	SccProjectName="&quot;$/pjproject&quot;, PIAAAAAA"
+	SccProjectName=""
 	SccAuxPath=""
-	SccLocalPath="..\.."
-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">
+	SccLocalPath=""
+	SccProvider="">
 	<Platforms>
 		<Platform
@@ -16,6 +15,6 @@
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\output\pjlib_test_vc7_Debug"
-			IntermediateDirectory=".\output\pjlib_test_vc7_Debug"
+			OutputDirectory=".\output\pjlib-test-i386-win32-vc7-debug"
+			IntermediateDirectory=".\output\pjlib-test-i386-win32-vc7-debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
@@ -25,13 +24,13 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;PJ_WIN32;PJ_M_I386"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\output\pjlib_test_vc7_Debug/pjlib_test.pch"
-				AssemblerListingLocation=".\output\pjlib_test_vc7_Debug/"
-				ObjectFile=".\output\pjlib_test_vc7_Debug/"
-				ProgramDataBaseFileName=".\output\pjlib_test_vc7_Debug/"
+				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="4"
@@ -44,14 +43,14 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile="..\bin\pjlib_test_vc7d.exe"
-				LinkIncremental="2"
+				OutputFile="../bin/pjlib-test-i386-win32-vc7-debug.exe"
+				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\output\pjlib_test_vc7_Debug/pjlib_test.pdb"
+				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_vc7_Debug/pjlib_test.tlb"
+				TypeLibraryName=".\output\pjlib-test-i386-win32-vc7-debug/pjlib_test.tlb"
 				HeaderFileName=""/>
 			<Tool
@@ -78,6 +77,6 @@
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\output\pjlib_test_vc7_Release"
-			IntermediateDirectory=".\output\pjlib_test_vc7_Release"
+			OutputDirectory=".\output\pjlib-test-i386-win32-vc7-release"
+			IntermediateDirectory=".\output\pjlib-test-i386-win32-vc7-release"
 			ConfigurationType="1"
 			UseOfMFC="0"
@@ -88,14 +87,14 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;PJ_WIN32;PJ_M_I386"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\output\pjlib_test_vc7_Release/pjlib_test.pch"
-				AssemblerListingLocation=".\output\pjlib_test_vc7_Release/"
-				ObjectFile=".\output\pjlib_test_vc7_Release/"
-				ProgramDataBaseFileName=".\output\pjlib_test_vc7_Release/"
+				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/"
 				BrowseInformation="1"
 				WarningLevel="4"
@@ -108,14 +107,14 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../bin/pjlib_test_vc7.exe"
+				OutputFile="../bin/pjlib-test-i386-win32-vc7-release.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\output\pjlib_test_vc7_Release/pjlib_test.pdb"
+				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_vc7_Release/pjlib_test.tlb"
+				TypeLibraryName=".\output\pjlib-test-i386-win32-vc7-release/pjlib_test.tlb"
 				HeaderFileName=""/>
 			<Tool
@@ -148,247 +147,664 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="..\src\test\exception_test.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\fifobuf_test.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\ioqueue_test.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\ioqueue_test_tcp.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\ioqueue_test_udp.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\list_test.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\os_test.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\pool_test.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\rbtree_test.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\timer_test.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=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\test\xml_test.cpp">
+				RelativePath="..\src\pjlib-test\atomic.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\echo_clt.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\echo_srv.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\errno.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\exception.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\fifobuf.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">
+				<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_tcp.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_udp.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\list.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\main.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\main_mod.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\pjlib-test\mutex.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\os.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\pool.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\pool_perf.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\rand.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\rbtree.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\select.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\sleep.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\sock.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\sock_perf.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\string.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\test.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\thread.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\timer.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\timestamp.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">
+					<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\util.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\xml.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>
 		</Filter>
@@ -397,5 +813,5 @@
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath="..\src\test\libpj_test.h">
+				RelativePath="..\src\pjlib-test\test.h">
 			</File>
 		</Filter>
@@ -404,11 +820,4 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 		</Filter>
-		<Filter
-			Name="Test Files"
-			Filter="">
-			<File
-				RelativePath="..\src\test\pidf-diff.xml">
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
Index: /pjproject/main/pjlib/build/pjlibpp.vcproj
===================================================================
--- /pjproject/main/pjlib/build/pjlibpp.vcproj	(revision 5)
+++ /pjproject/main/pjlib/build/pjlibpp.vcproj	(revision 6)
@@ -4,9 +4,8 @@
 	Version="7.10"
 	Name="pjlibpp"
-	ProjectGUID="{488B9CA1-8F59-4E4E-8748-D6A712CF9F3C}"
-	SccProjectName="&quot;$/pjproject&quot;, PIAAAAAA"
+	SccProjectName=""
 	SccAuxPath=""
-	SccLocalPath="..\.."
-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">
+	SccLocalPath=""
+	SccProvider="">
 	<Platforms>
 		<Platform
@@ -16,6 +15,6 @@
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\output\pjlibpp_vc7_Release"
-			IntermediateDirectory=".\output\pjlibpp_vc7_Release"
+			OutputDirectory=".\output\pjlibpp-i386-win32-vc7-release"
+			IntermediateDirectory=".\output\pjlibpp-i386-win32-vc7-release"
 			ConfigurationType="4"
 			UseOfMFC="0"
@@ -27,13 +26,12 @@
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_I386"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\output\pjlibpp_vc7_Release/pjlibpp.pch"
-				AssemblerListingLocation=".\output\pjlibpp_vc7_Release/"
-				ObjectFile=".\output\pjlibpp_vc7_Release/"
-				ProgramDataBaseFileName=".\output\pjlibpp_vc7_Release/"
+				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/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@@ -43,5 +41,5 @@
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\pjlibpp_vc7s.lib"
+				OutputFile="../lib/pjlibp_vc6s.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -68,6 +66,6 @@
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\output\pjlibpp_vc7_Debug"
-			IntermediateDirectory=".\output\pjlibpp_vc7_Debug"
+			OutputDirectory=".\output\pjlibpp-i386-win32-vc7-debug"
+			IntermediateDirectory=".\output\pjlibpp-i386-win32-vc7-debug"
 			ConfigurationType="4"
 			UseOfMFC="0"
@@ -78,12 +76,11 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="../src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_I386"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\output\pjlibpp_vc7_Debug/pjlibpp.pch"
-				AssemblerListingLocation=".\output\pjlibpp_vc7_Debug/"
-				ObjectFile=".\output\pjlibpp_vc7_Debug/"
-				ProgramDataBaseFileName=".\output\pjlibpp_vc7_Debug/"
+				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/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@@ -94,5 +91,5 @@
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\pjlibpp_vc7sd.lib"
+				OutputFile="../lib/pjlibp_vc6sd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -127,16 +124,13 @@
 				RelativePath="..\src\pj++\compiletest.cpp">
 				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						AssemblerOutput="4"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
@@ -150,14 +144,19 @@
 				RelativePath="..\src\pj++\pj++.cpp">
 				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
+					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>
@@ -165,14 +164,19 @@
 				RelativePath="..\src\pj++\proactor.cpp">
 				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
+					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>
@@ -192,4 +196,7 @@
 			<File
 				RelativePath="..\src\pj++\os.hpp">
+			</File>
+			<File
+				RelativePath="..\src\pjlib++.hpp">
 			</File>
 			<File
Index: /pjproject/main/pjlib/include/pj/addr_resolv.h
===================================================================
--- /pjproject/main/pjlib/include/pj/addr_resolv.h	(revision 5)
+++ /pjproject/main/pjlib/include/pj/addr_resolv.h	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 
Index: /pjproject/main/pjlib/include/pj/doxygen.h
===================================================================
--- /pjproject/main/pjlib/include/pj/doxygen.h	(revision 5)
+++ /pjproject/main/pjlib/include/pj/doxygen.h	(revision 6)
@@ -10,5 +10,5 @@
  */
 
-/*//////////////////////////////////////////////////////////////////////////*/
+/*////////////////////////////////////////////////////////////////////////// */
 /*
 	INTRODUCTION PAGE
@@ -442,12 +442,48 @@
  *  - i386/Linux
  *  - i386/Linux (kernel)
- *
- * Generally, steps required to build the projects are:
+ *  - alpha/linux
+ *  - sparc/SunOS
+ *  - etc..
+ *
+ *
+ * @subsubsection build_req_sec Requirements
+ *
+ * In order to use the \c make based build system, you MUST have:
+ *
+ *  - <b>GNU make</b>
+ *\n
+ *    The Makefiles heavily utilize GNU make commands which most likely
+ *    are not available in other \c make system.
+ *  - <b>bash</b> shell is recommended.
+ *\n
+ *    Specificly, there is a command <tt>"echo -n"</tt> which may not work
+ *    in other shells. This command is used when generating dependencies
+ *    (<tt>make dep</tt>) and it's located in 
+ *    <tt>$PJPROJECT/build/rules.mak</tt>.
+ *  - <b>ar</b>, <b>ranlib</b> from GNU binutils
+ *\n
+ *    In your system has different <tt>ar</tt> or <tt>ranlib</tt> (e.g. they
+ *    may have been installed as <tt>gar</tt> and <tt>granlib</tt>), then
+ *    either you create the relevant symbolic links, <b>or</b> modify
+ *    <tt>$PJPROJECT/build/cc-gcc.mak</tt> and rename <tt>ar</tt> and
+ *    <tt>ranlib</tt> to the appropriate names.
+ *  - <b>gcc</b> to generate dependency.
+ *\n
+ *    Currently the build system uses <tt>"gcc -MM"</tt> to generate build
+ *    dependencies. If <tt>gcc</tt> is not desired to generate dependency,
+ *    then either you don't run <tt>make dep</tt>, <b>or</b> edit
+ *    <tt>$PJPROJECT/build/rules.mak</tt> to calculate dependency using
+ *    your prefered method. (And let me know when you do so so that I can
+ *    update the file. :) )
+ *
+ * @subsubsection build_overview_sec Building the Project
+ *
+ * Generally, steps required to build the PJLIB are:
  *
  \verbatim
-   $ cd /home/user/pjproject-0.3     # <-- go to $PJPROJECT\n
-   $ vi build.mak                    # <-- set build target etc\n
-   $ cd pjlib/build                  # <-- go to projet's build dir\n
-   $ make                            # <-- build the project\n
+   $ cd /home/user/pjproject         # <-- go to $PJPROJECT
+   $ vi build.mak                    # <-- set build target etc
+   $ cd pjlib/build                  # <-- go to projet's build dir
+   $ make                            # <-- build the project
  \endverbatim
  *
@@ -464,19 +500,25 @@
  * the following \a make variables:
  *
- *  - \c MACHINE_NAME
- *\n
- *    Target machine/processor, one of: <b>{ i386 }</b>.
- *
- *  - \c OS_NAME
- *\n
- *    Target operating system, one of: <b>{ win32 | linux | linux-kernel }</b>.
- *
- *  - \c CC_NAME
- *\n
- *    Compiler name: <b>{ gcc | vc }</b>
- *
- *  - \c HOST_NAME
- *\n
- *    Build host: <b>{ unix | mingw }</b>
+ *  - <tt><b>MACHINE_NAME</b></tt>
+ *\n
+ *    Target machine/processor, one of: <b>{ i386 | alpha | sparc }</b>.
+ *
+ *  - <tt><b>OS_NAME</b></tt>
+ *\n
+ *    Target operating system, one of: <b>{ win32 | linux | 
+ *      linux-kernel | sunos }</b>.
+ *
+ *  - <tt><b>CC_NAME</b></tt>
+ *\n
+ *    Compiler name: <b>{ gcc | vc }</b>\n
+ *    (Note that support for Visual C (vc) compiler with the \c make system is
+ *    experimental, and it will only work when run inside a DOS shell
+ *    (i.e. <tt>"HOST_NAME=win32"</tt>)).
+ *
+ *  - <tt><b>HOST_NAME</b></tt>
+ *\n
+ *    Build host: <b>{ unix | mingw | win32 }</b>\n
+ *    (Note: win32 host means a DOS command prompt. Support for this type
+ *    of development host is experimental).
  *
  * These variables will cause the correct configuration file in 
@@ -534,4 +576,7 @@
  \endverbatim
  *
+ * Alternatively you may invoke <tt>make</tt> in <tt>$PJPROJECT</tt> 
+ * directory, to build all projects under that directory (e.g. 
+ * PJLIB, PJSIP, etc.).
  *
  *
Index: /pjproject/main/pjlib/src/pj/addr_resolv_sock.c
===================================================================
--- /pjproject/main/pjlib/src/pj/addr_resolv_sock.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/addr_resolv_sock.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/addr_resolv.h>
Index: /pjproject/main/pjlib/src/pj/array.c
===================================================================
--- /pjproject/main/pjlib/src/pj/array.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/array.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/array.h>
Index: /pjproject/main/pjlib/src/pj/config.c
===================================================================
--- /pjproject/main/pjlib/src/pj/config.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/config.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/config.h>
Index: /pjproject/main/pjlib/src/pj/equeue_winnt.c
===================================================================
--- /pjproject/main/pjlib/src/pj/equeue_winnt.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/equeue_winnt.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/equeue.h>
Index: /pjproject/main/pjlib/src/pj/errno.c
===================================================================
--- /pjproject/main/pjlib/src/pj/errno.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/errno.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/errno.h>
Index: /pjproject/main/pjlib/src/pj/except.c
===================================================================
--- /pjproject/main/pjlib/src/pj/except.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/except.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/except.h>
Index: /pjproject/main/pjlib/src/pj/fifobuf.c
===================================================================
--- /pjproject/main/pjlib/src/pj/fifobuf.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/fifobuf.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/fifobuf.h>
Index: /pjproject/main/pjlib/src/pj/guid.c
===================================================================
--- /pjproject/main/pjlib/src/pj/guid.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/guid.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/guid.h>
Index: /pjproject/main/pjlib/src/pj/guid_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/guid_win32.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/guid_win32.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/guid.h>
Index: /pjproject/main/pjlib/src/pj/hash.c
===================================================================
--- /pjproject/main/pjlib/src/pj/hash.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/hash.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/hash.h>
Index: /pjproject/main/pjlib/src/pj/ioqueue_select.c
===================================================================
--- /pjproject/main/pjlib/src/pj/ioqueue_select.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/ioqueue_select.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 /*
Index: /pjproject/main/pjlib/src/pj/ioqueue_winnt.c
===================================================================
--- /pjproject/main/pjlib/src/pj/ioqueue_winnt.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/ioqueue_winnt.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/ioqueue.h>
Index: /pjproject/main/pjlib/src/pj/list.c
===================================================================
--- /pjproject/main/pjlib/src/pj/list.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/list.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/list.h>
Index: /pjproject/main/pjlib/src/pj/lock.c
===================================================================
--- /pjproject/main/pjlib/src/pj/lock.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/lock.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/lock.h>
Index: /pjproject/main/pjlib/src/pj/log.c
===================================================================
--- /pjproject/main/pjlib/src/pj/log.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/log.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/types.h>
Index: /pjproject/main/pjlib/src/pj/log_writer_stdout.c
===================================================================
--- /pjproject/main/pjlib/src/pj/log_writer_stdout.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/log_writer_stdout.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/log.h>
Index: /pjproject/main/pjlib/src/pj/md5.c
===================================================================
--- /pjproject/main/pjlib/src/pj/md5.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/md5.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 /*
Index: /pjproject/main/pjlib/src/pj/os_core_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_core_win32.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/os_core_win32.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/os.h>
Index: /pjproject/main/pjlib/src/pj/os_error_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_error_win32.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/os_error_win32.c	(revision 6)
@@ -1,17 +1,3 @@
 /* $Id$
- *
- */
-/* $Log: /pjproject-0.3/pjlib/src/pj/os_error_win32.c $
- * 
- * 3     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 2     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 1     9/17/05 10:36a Bennylp
- * Created.
- *
  */
 #include <pj/errno.h>
Index: /pjproject/main/pjlib/src/pj/os_time_ansi.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_time_ansi.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/os_time_ansi.c	(revision 6)
@@ -1,14 +1,3 @@
 /* $Id$
- *
- */
-/* $Log: /pjproject-0.3/pjlib/src/pj/os_time_ansi.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     9/17/05 10:36a Bennylp
- * Created.
- *
  */
 #include <pj/os.h>
Index: /pjproject/main/pjlib/src/pj/os_timestamp_common.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_timestamp_common.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/os_timestamp_common.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/os.h>
Index: /pjproject/main/pjlib/src/pj/os_timestamp_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_timestamp_win32.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/os_timestamp_win32.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/os.h>
Index: /pjproject/main/pjlib/src/pj/pool.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/pool.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/pool_caching.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool_caching.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/pool_caching.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/pool_dbg_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool_dbg_win32.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/pool_dbg_win32.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/pool_policy_malloc.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool_policy_malloc.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/pool_policy_malloc.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/rand.c
===================================================================
--- /pjproject/main/pjlib/src/pj/rand.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/rand.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/rand.h>
Index: /pjproject/main/pjlib/src/pj/rbtree.c
===================================================================
--- /pjproject/main/pjlib/src/pj/rbtree.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/rbtree.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/rbtree.h>
Index: /pjproject/main/pjlib/src/pj/scanner.c
===================================================================
--- /pjproject/main/pjlib/src/pj/scanner.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/scanner.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/scanner.h>
Index: /pjproject/main/pjlib/src/pj/sock_bsd.c
===================================================================
--- /pjproject/main/pjlib/src/pj/sock_bsd.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/sock_bsd.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/sock.h>
Index: /pjproject/main/pjlib/src/pj/sock_select.c
===================================================================
--- /pjproject/main/pjlib/src/pj/sock_select.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/sock_select.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/sock_select.h>
@@ -13,5 +12,6 @@
 
 #ifdef _MSC_VER
-#  pragma warning(disable: 4018)    // Signed/unsigned mismatch in FD_*
+#   pragma warning(disable: 4018)    // Signed/unsigned mismatch in FD_*
+#   pragma warning(disable: 4389)    // Signed/unsigned mismatch in FD_*
 #endif
 
Index: /pjproject/main/pjlib/src/pj/string.c
===================================================================
--- /pjproject/main/pjlib/src/pj/string.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/string.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/string.h>
Index: /pjproject/main/pjlib/src/pj/stun.c
===================================================================
--- /pjproject/main/pjlib/src/pj/stun.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/stun.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/stun.h>
Index: /pjproject/main/pjlib/src/pj/stun_client.c
===================================================================
--- /pjproject/main/pjlib/src/pj/stun_client.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/stun_client.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/stun.h>
Index: /pjproject/main/pjlib/src/pj/timer.c
===================================================================
--- /pjproject/main/pjlib/src/pj/timer.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/timer.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 /* (C)1993-2003 Douglas C. Schmidt
Index: /pjproject/main/pjlib/src/pj/types.c
===================================================================
--- /pjproject/main/pjlib/src/pj/types.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/types.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/types.h>
Index: /pjproject/main/pjlib/src/pj/xml.c
===================================================================
--- /pjproject/main/pjlib/src/pj/xml.c	(revision 5)
+++ /pjproject/main/pjlib/src/pj/xml.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include <pj/xml.h>
Index: /pjproject/main/pjlib/src/pjlib-samples/except.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-samples/except.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-samples/except.c	(revision 6)
@@ -1,15 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-samples/except.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/10/05 3:16p Bennylp
- * Created.
- *
  */
 #include <pj/except.h>
Index: /pjproject/main/pjlib/src/pjlib-samples/list.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-samples/list.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-samples/list.c	(revision 6)
@@ -1,17 +1,4 @@
 /* $Id$
- *
  */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-samples/list.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/10/05 5:12p Bennylp
- * Created.
- *
- */
-
 #include <pj/list.h>
 #include <pj/assert.h>
Index: /pjproject/main/pjlib/src/pjlib-samples/log.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-samples/log.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-samples/log.c	(revision 6)
@@ -1,15 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-samples/log.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/10/05 3:16p Bennylp
- * Created.
- *
  */
 #include <pj/log.h>
Index: /pjproject/main/pjlib/src/pjlib-test/atomic.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/atomic.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/atomic.c	(revision 6)
@@ -1,15 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/atomic.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/07/05 9:49p Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/echo_clt.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/echo_clt.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/echo_clt.c	(revision 6)
@@ -1,17 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/echo_clt.c $
- * 
- * 3     10/29/05 10:25p Bennylp
- * Tested.
- * 
- * 2     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 1     10/24/05 11:28a Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/echo_srv.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/echo_srv.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/echo_srv.c	(revision 6)
@@ -1,17 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/echo_srv.c $
- * 
- * 3     10/29/05 10:23p Bennylp
- * Changed ioqueue accept specification.
- * 
- * 2     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 1     10/24/05 11:28a Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/errno.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/errno.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/errno.c	(revision 6)
@@ -1,21 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/errno.c $
- * 
- * 4     10/14/05 3:05p Bennylp
- * Fixed warning about strlen() on Linux.
- * 
- * 3     14/10/05 11:30 Bennylp
- * Verify the error message.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/09/05 9:56p Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/exception.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/exception.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/exception.c	(revision 6)
@@ -1,5 +1,3 @@
 /* $Id$
- *
-
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/fifobuf.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/fifobuf.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/fifobuf.c	(revision 6)
@@ -1,5 +1,3 @@
 /* $Id$
- *
-
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/ioq_perf.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/ioq_perf.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/ioq_perf.c	(revision 6)
@@ -1,21 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/ioq_perf.c $
- * 
- * 4     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 3     14/10/05 11:31 Bennylp
- * More generalized test method, works for UDP too.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/11/05 3:52p Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/ioq_tcp.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/ioq_tcp.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/ioq_tcp.c	(revision 6)
@@ -1,19 +1,3 @@
 /* $Id$
- *
-
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/ioq_tcp.c $
- * 
- * 4     10/29/05 10:23p Bennylp
- * Fixed no-memory exception.
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/ioq_udp.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/ioq_udp.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/ioq_udp.c	(revision 6)
@@ -1,19 +1,3 @@
 /* $Id$
- *
-
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/ioq_udp.c $
- * 
- * 4     10/29/05 10:23p Bennylp
- * Fixed no-memory exception.
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/list.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/list.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/list.c	(revision 6)
@@ -1,5 +1,3 @@
 /* $Id$
- *
-
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/main.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/main.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/main.c	(revision 6)
@@ -1,19 +1,3 @@
 /* $Id$
- *
-
- */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/main.c $
- * 
- * 4     29/10/05 21:32 Bennylp
- * Boost process priority in Win32
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/main_mod.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/main_mod.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/main_mod.c	(revision 6)
@@ -1,15 +1,3 @@
 /* $Id$
- *
-
- */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/main_mod.c $
- * 
- * 2     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 1     10/05/05 5:12p Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/mutex.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/mutex.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/mutex.c	(revision 6)
@@ -1,11 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/mutex.c $
- * 
- * 1     10/23/05 12:52p Bennylp
- * Craeted.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/os.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/os.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/os.c	(revision 6)
@@ -1,12 +1,3 @@
 /* $Id$
- *
-
  */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/os.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- *
- */
+int dummy_os_var;
Index: /pjproject/main/pjlib/src/pjlib-test/pool.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/pool.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/pool.c	(revision 6)
@@ -1,13 +1,3 @@
 /* $Id$
- *
-
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/pool.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pjlib-test/pool_perf.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/pool_perf.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/pool_perf.c	(revision 6)
@@ -1,15 +1,3 @@
 /* $Id$
- *
- */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/pool_perf.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/05/05 5:13p Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/rand.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/rand.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/rand.c	(revision 6)
@@ -1,11 +1,3 @@
 /* $Id$
- *
- */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/rand.c $
- * 
- * 1     10/05/05 5:13p Bennylp
- * Created.
- *
  */
 #include <pj/rand.h>
Index: /pjproject/main/pjlib/src/pjlib-test/rbtree.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/rbtree.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/rbtree.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/select.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/select.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/select.c	(revision 6)
@@ -1,12 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/select.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/sleep.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/sleep.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/sleep.c	(revision 6)
@@ -1,19 +1,3 @@
 /* $Id$
- *
-
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/sleep.c $
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/11/05 12:53a Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/sock.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/sock.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/sock.c	(revision 6)
@@ -1,24 +1,3 @@
 /* $Id$
- *
- */
-/* $Log: /pjproject-0.3/pjlib/src/pjlib-test/sock.c $
- * 
- * 4     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 3     14/10/05 11:31 Bennylp
- * Fixed bug when TCP data is received in chunks.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     9/21/05 1:38p Bennylp
- * Renamed from *.cpp
- * 
- * 2     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
- * 1     9/15/05 8:41p Bennylp
  */
 #include <pjlib.h>
Index: /pjproject/main/pjlib/src/pjlib-test/sock_perf.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/sock_perf.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/sock_perf.c	(revision 6)
@@ -1,21 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/sock_perf.c $
- * 
- * 4     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 3     14/10/05 11:31 Bennylp
- * Fixed bug when TCP data is part_received in chunks.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/11/05 11:18p Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/string.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/string.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/string.c	(revision 6)
@@ -1,15 +1,3 @@
 /* $Id$
- *
- */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/string.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/05/05 5:13p Bennylp
- * Created.
- *
  */
 #include <pj/string.h>
Index: /pjproject/main/pjlib/src/pjlib-test/test.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/test.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/test.c	(revision 6)
@@ -1,22 +1,3 @@
 /* $Id$
- *
-
- */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/test.c $
- * 
- * 4     29/10/05 21:33 Bennylp
- * Changed echo_server() to echo_srv_sync()
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/05/05 5:13p Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/test.h
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/test.h	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/test.h	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #ifndef __PJLIB_TEST_H__
@@ -45,5 +44,5 @@
 #define ECHO_SERVER_DURATION_MSEC   (60*60*1000)
 
-#define ECHO_CLIENT_MAX_THREADS     6
+#define ECHO_CLIENT_MAX_THREADS     10
 
 PJ_BEGIN_DECL
Index: /pjproject/main/pjlib/src/pjlib-test/thread.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/thread.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/thread.c	(revision 6)
@@ -1,22 +1,3 @@
 /* $Id$
- *
-
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/thread.c $
- * 
- * 4     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 3     14/10/05 11:32 Bennylp
- * More lenient with timeslice difference.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/11/05 12:39a Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/timer.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/timer.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/timer.c	(revision 6)
@@ -1,4 +1,3 @@
 /* $Id$
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/timestamp.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/timestamp.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/timestamp.c	(revision 6)
@@ -1,21 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/timestamp.c $
- * 
- * 4     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 3     14/10/05 11:32 Bennylp
- * Longer test, to check if timestamp is running backwards.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/09/05 9:39p Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/udp_echo_srv_sync.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/udp_echo_srv_sync.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/udp_echo_srv_sync.c	(revision 6)
@@ -1,14 +1,3 @@
 /* $Id$
- *
- */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/udp_echo_srv_sync.c $
- * 
- * 2     29/10/05 21:34 Bennylp
- * Tested on Win32
- * 
- * 1     10/29/05 9:56a Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/util.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/util.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/util.c	(revision 6)
@@ -1,19 +1,3 @@
 /* $Id$
- *
-
- */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pjlib-test/util.c $
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/12/05 10:00a Bennylp
- * Created.
- *
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/xml.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/xml.c	(revision 5)
+++ /pjproject/main/pjlib/src/pjlib-test/xml.c	(revision 6)
@@ -1,2 +1,4 @@
+/* $Id$
+ */
 #include "test.h"
 
