Ticket #7: Move PJSIP compile time configurations/settings (such as T1, T2 timers) to run-time (thanks Philippe Leuba)

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

13 files changed, 2152 insertions, 1070 deletions

diff --git a/build.symbian/pjsip.mmp b/build.symbian/pjsip.mmp
index 515a6121..8fb7d085 100644
--- a/build.symbian/pjsip.mmp
+++ b/build.symbian/pjsip.mmp
@@ -36,6 +36,7 @@ SOURCE	sip_auth_client.c
 SOURCE	sip_auth_msg.c
 SOURCE	sip_auth_parser.c
 SOURCE	sip_auth_server.c
+SOURCE	sip_config.c
 SOURCE	sip_dialog.c
 SOURCE	sip_endpoint.c
 SOURCE	sip_errno.c
diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c
index a39c77ef..d5a803b7 100644
--- a/pjsip-apps/src/samples/pjsip-perf.c
+++ b/pjsip-apps/src/samples/pjsip-perf.c
@@ -71,7 +71,7 @@
 #endif
 
 #define THIS_FILE	    "pjsip-perf.c"
-#define DEFAULT_COUNT	    (PJSIP_MAX_TSX_COUNT/2>10000?10000:PJSIP_MAX_TSX_COUNT/2)
+#define DEFAULT_COUNT	    (pjsip_cfg()->tsx.max_count/2>10000?10000:pjsip_cfg()->tsx.max_count/2)
 #define JOB_WINDOW	    1000
 #define TERMINATE_TSX(x,c)
 
@@ -1222,11 +1222,11 @@ static pj_status_t init_options(int argc, char *argv[])
 		PJ_LOG(3,(THIS_FILE, "Invalid --local-port %s", pj_optarg));
 		return -1;
 	    }
-	    if (app.client.job_count > PJSIP_MAX_TSX_COUNT)
+	    if (app.client.job_count > pjsip_cfg()->tsx.max_count)
 		PJ_LOG(3,(THIS_FILE, 
 			  "Warning: --count value (%d) exceeds maximum "
 			  "transaction count (%d)", app.client.job_count,
-			  PJSIP_MAX_TSX_COUNT));
+			  pjsip_cfg()->tsx.max_count));
 	    break;
 
 	case OPT_THREAD_COUNT:
diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
index dd331a1a..0f7624e6 100644
--- a/pjsip/build/Makefile
+++ b/pjsip/build/Makefile
@@ -36,6 +36,7 @@ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
 #
 export PJSIP_SRCDIR = ../src/pjsip
 export PJSIP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+		sip_config.o \
 		sip_errno.o sip_msg.o sip_parser.o sip_tel_uri.o sip_uri.o \
 		sip_endpoint.o sip_util.o sip_util_proxy.o \
 		sip_resolve.o sip_transport.o sip_transport_loop.o \
diff --git a/pjsip/build/pjsip_core.dsp b/pjsip/build/pjsip_core.dsp
index 245985a2..4a5389b5 100644
--- a/pjsip/build/pjsip_core.dsp
+++ b/pjsip/build/pjsip_core.dsp
@@ -92,6 +92,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""

 # Begin Source File

 

+SOURCE=..\src\pjsip\sip_config.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\pjsip\sip_errno.c

 # End Source File

 # End Group

diff --git a/pjsip/build/pjsip_core.vcproj b/pjsip/build/pjsip_core.vcproj
index aac8fa95..b0823ccb 100644
--- a/pjsip/build/pjsip_core.vcproj
+++ b/pjsip/build/pjsip_core.vcproj
@@ -1,854 +1,858 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pjsip_core"

-	ProjectGUID="{2BB84911-C1B4-4747-B93D-36AA82CC5031}"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\output\pjsip-core-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjsip-core-i386-win32-vc8-release"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

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

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

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\output\pjsip-core-i386-win32-vc8-release/pjsip_core.pch"

-				AssemblerListingLocation=".\output\pjsip-core-i386-win32-vc8-release/"

-				ObjectFile=".\output\pjsip-core-i386-win32-vc8-release/"

-				ProgramDataBaseFileName=".\output\pjsip-core-i386-win32-vc8-release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../lib/pjsip-core-i386-win32-vc8-release.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\output\pjsip-core-i386-win32-vc8-release/pjsip_core.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\output\pjsip-core-i386-win32-vc8-debug"

-			IntermediateDirectory=".\output\pjsip-core-i386-win32-vc8-debug"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

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

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

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\output\pjsip-core-i386-win32-vc8-debug/pjsip_core.pch"

-				AssemblerListingLocation=".\output\pjsip-core-i386-win32-vc8-debug/"

-				ObjectFile=".\output\pjsip-core-i386-win32-vc8-debug/"

-				ProgramDataBaseFileName=".\output\pjsip-core-i386-win32-vc8-debug/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../lib/pjsip-core-i386-win32-vc8-debug.lib"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\output\pjsip-core-i386-win32-vc8-debug/pjsip_core.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

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

-			>

-			<Filter

-				Name="Base (.c)"

-				>

-				<File

-					RelativePath="..\src\pjsip\sip_errno.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-			</Filter>

-			<Filter

-				Name="Messaging and Parsing (.c)"

-				>

-				<File

-					RelativePath="..\src\pjsip\sip_msg.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_parser.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_tel_uri.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_uri.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-			</Filter>

-			<Filter

-				Name="Core (.c)"

-				>

-				<File

-					RelativePath="..\src\pjsip\sip_endpoint.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_util.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_util_proxy.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-			</Filter>

-			<Filter

-				Name="Transport Layer (.c)"

-				>

-				<File

-					RelativePath="..\src\pjsip\sip_resolve.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_transport.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_transport_loop.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_transport_tcp.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_transport_tls_ossl.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_transport_udp.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-			</Filter>

-			<Filter

-				Name="Authentication (.c)"

-				>

-				<File

-					RelativePath="..\src\pjsip\sip_auth_aka.c"

-					>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_auth_client.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_auth_msg.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_auth_parser.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_auth_server.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-			</Filter>

-			<Filter

-				Name="Transaction Layer (.c)"

-				>

-				<File

-					RelativePath="..\src\pjsip\sip_transaction.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_util_statefull.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-			</Filter>

-			<Filter

-				Name="UA Layer (.c)"

-				>

-				<File

-					RelativePath="..\src\pjsip\sip_dialog.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath="..\src\pjsip\sip_ua_layer.c"

-					>

-					<FileConfiguration

-						Name="Release|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Debug|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-							AdditionalIncludeDirectories=""

-							PreprocessorDefinitions=""

-						/>

-					</FileConfiguration>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Header Files"

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

-			>

-			<File

-				RelativePath="..\docs\doxygen.h"

-				>

-			</File>

-			<File

-				RelativePath="..\include\pjsip.h"

-				>

-			</File>

-			<Filter

-				Name="Base Types (.h)"

-				>

-				<File

-					RelativePath="..\include\pjsip\sip_config.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_errno.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_private.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_types.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="Messaging and Parsing (.h)"

-				>

-				<File

-					RelativePath="..\include\pjsip\print_util.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_msg.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_parser.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_tel_uri.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_uri.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="Core (.h)"

-				>

-				<File

-					RelativePath="..\include\pjsip\sip_endpoint.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_event.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_module.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_util.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="Transport Layer (.h)"

-				>

-				<File

-					RelativePath="..\include\pjsip\sip_resolve.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_transport.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_transport_loop.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_transport_tcp.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_transport_tls.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_transport_udp.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="Authentication (.h)"

-				>

-				<File

-					RelativePath="..\include\pjsip\sip_auth.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_auth_aka.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_auth_msg.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_auth_parser.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="Transaction Layer (.h)"

-				>

-				<File

-					RelativePath="..\include\pjsip\sip_transaction.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="UA Layer (.h)"

-				>

-				<File

-					RelativePath="..\include\pjsip\sip_dialog.h"

-					>

-				</File>

-				<File

-					RelativePath="..\include\pjsip\sip_ua_layer.h"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Inline Files"

-			>

-		</Filter>

-		<File

-			RelativePath="..\..\INSTALL.txt"

-			>

-		</File>

-		<File

-			RelativePath="..\..\RELNOTES.txt"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjsip_core"
+	ProjectGUID="{2BB84911-C1B4-4747-B93D-36AA82CC5031}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\output\pjsip-core-i386-win32-vc8-release"
+			IntermediateDirectory=".\output\pjsip-core-i386-win32-vc8-release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\output\pjsip-core-i386-win32-vc8-release/pjsip_core.pch"
+				AssemblerListingLocation=".\output\pjsip-core-i386-win32-vc8-release/"
+				ObjectFile=".\output\pjsip-core-i386-win32-vc8-release/"
+				ProgramDataBaseFileName=".\output\pjsip-core-i386-win32-vc8-release/"
+				BrowseInformation="1"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="../lib/pjsip-core-i386-win32-vc8-release.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\output\pjsip-core-i386-win32-vc8-release/pjsip_core.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\output\pjsip-core-i386-win32-vc8-debug"
+			IntermediateDirectory=".\output\pjsip-core-i386-win32-vc8-debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\output\pjsip-core-i386-win32-vc8-debug/pjsip_core.pch"
+				AssemblerListingLocation=".\output\pjsip-core-i386-win32-vc8-debug/"
+				ObjectFile=".\output\pjsip-core-i386-win32-vc8-debug/"
+				ProgramDataBaseFileName=".\output\pjsip-core-i386-win32-vc8-debug/"
+				BrowseInformation="1"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="../lib/pjsip-core-i386-win32-vc8-debug.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\output\pjsip-core-i386-win32-vc8-debug/pjsip_core.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<Filter
+				Name="Base (.c)"
+				>
+				<File
+					RelativePath="..\src\pjsip\sip_errno.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Messaging and Parsing (.c)"
+				>
+				<File
+					RelativePath="..\src\pjsip\sip_msg.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_parser.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_tel_uri.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_uri.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Core (.c)"
+				>
+				<File
+					RelativePath="..\src\pjsip\sip_config.c"
+					>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_endpoint.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_util.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_util_proxy.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Transport Layer (.c)"
+				>
+				<File
+					RelativePath="..\src\pjsip\sip_resolve.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_transport.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_transport_loop.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_transport_tcp.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_transport_tls_ossl.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_transport_udp.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Authentication (.c)"
+				>
+				<File
+					RelativePath="..\src\pjsip\sip_auth_aka.c"
+					>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_auth_client.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_auth_msg.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_auth_parser.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_auth_server.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Transaction Layer (.c)"
+				>
+				<File
+					RelativePath="..\src\pjsip\sip_transaction.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_util_statefull.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="UA Layer (.c)"
+				>
+				<File
+					RelativePath="..\src\pjsip\sip_dialog.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\pjsip\sip_ua_layer.c"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\docs\doxygen.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\pjsip.h"
+				>
+			</File>
+			<Filter
+				Name="Base Types (.h)"
+				>
+				<File
+					RelativePath="..\include\pjsip\sip_config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_errno.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_private.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_types.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Messaging and Parsing (.h)"
+				>
+				<File
+					RelativePath="..\include\pjsip\print_util.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_msg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_parser.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_tel_uri.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_uri.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Core (.h)"
+				>
+				<File
+					RelativePath="..\include\pjsip\sip_endpoint.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_event.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_module.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_util.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Transport Layer (.h)"
+				>
+				<File
+					RelativePath="..\include\pjsip\sip_resolve.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_transport.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_transport_loop.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_transport_tcp.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_transport_tls.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_transport_udp.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Authentication (.h)"
+				>
+				<File
+					RelativePath="..\include\pjsip\sip_auth.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_auth_aka.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_auth_msg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_auth_parser.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Transaction Layer (.h)"
+				>
+				<File
+					RelativePath="..\include\pjsip\sip_transaction.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="UA Layer (.h)"
+				>
+				<File
+					RelativePath="..\include\pjsip\sip_dialog.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\pjsip\sip_ua_layer.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Inline Files"
+			>
+		</Filter>
+		<File
+			RelativePath="..\..\INSTALL.txt"
+			>
+		</File>
+		<File
+			RelativePath="..\..\RELNOTES.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/pjsip/build/wince-evc4/pjsip_core_wince.vcp b/pjsip/build/wince-evc4/pjsip_core_wince.vcp
index 43a3ee77..01d59a53 100644
--- a/pjsip/build/wince-evc4/pjsip_core_wince.vcp
+++ b/pjsip/build/wince-evc4/pjsip_core_wince.vcp
@@ -1770,48 +1770,79 @@ NODEP_CPP_SIP_AU=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_AU=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\md5.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

 	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

 	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

 	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\sip_auth.h"\

+	"..\..\include\pjsip\sip_auth_aka.h"\

 	"..\..\include\pjsip\sip_auth_msg.h"\

 	"..\..\include\pjsip\sip_auth_parser.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -1821,10 +1852,7 @@ DEP_CPP_SIP_AU=\
 	"..\..\include\pjsip\sip_transport.h"\

 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

-	

-NODEP_CPP_SIP_AU=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

+	"..\..\include\pjsip\sip_util.h"\

 	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

@@ -2447,48 +2475,81 @@ NODEP_CPP_SIP_AUT=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_AUT=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

+	"..\..\..\pjlib\include\pj\compat\errno.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

+	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

+	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

+	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

+	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\print_util.h"\

 	"..\..\include\pjsip\sip_auth_msg.h"\

 	"..\..\include\pjsip\sip_auth_parser.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_msg.h"\

 	"..\..\include\pjsip\sip_parser.h"\

 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_AUT=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -3044,49 +3105,80 @@ NODEP_CPP_SIP_AUTH=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_AUTH=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

+	"..\..\..\pjlib\include\pj\compat\errno.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

 	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

+	"..\..\..\pjlib\include\pj\errno.h"\

 	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

+	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

+	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

+	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\sip_auth_msg.h"\

 	"..\..\include\pjsip\sip_auth_parser.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_msg.h"\

 	"..\..\include\pjsip\sip_parser.h"\

 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_AUTH=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -3680,43 +3772,75 @@ NODEP_CPP_SIP_AUTH_=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_AUTH_=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\sip_auth.h"\

 	"..\..\include\pjsip\sip_auth_msg.h"\

 	"..\..\include\pjsip\sip_auth_parser.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_errno.h"\

 	"..\..\include\pjsip\sip_msg.h"\

@@ -3725,10 +3849,6 @@ DEP_CPP_SIP_AUTH_=\
 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_AUTH_=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -4001,6 +4121,349 @@ DEP_CPP_SIP_AUTH_=\
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\src\pjsip\sip_config.c

+

+!IF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE emulator) Release"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE emulator) Debug"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4I) Release"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4I) Debug"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE MIPSIV_FP) Release"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE MIPSIV_FP) Debug"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4T) Release"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4T) Debug"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE x86) Release"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE x86) Debug"

+

+DEP_CPP_SIP_C=\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

+	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

+	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

+	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

+	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\config.h"\

+	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

+	"..\..\include\pjsip\sip_config.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\pjsip\sip_dialog.c

 

 !IF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE emulator) Release"

@@ -4430,50 +4893,76 @@ NODEP_CPP_SIP_D=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_D=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

 	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

 	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

 	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

 	"..\..\..\pjlib\include\pj\guid.h"\

 	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

 	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\sip_auth.h"\

 	"..\..\include\pjsip\sip_auth_msg.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_dialog.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

@@ -4489,10 +4978,6 @@ DEP_CPP_SIP_D=\
 	"..\..\include\pjsip\sip_uri.h"\

 	"..\..\include\pjsip\sip_util.h"\

 	

-NODEP_CPP_SIP_D=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -5242,46 +5727,74 @@ NODEP_CPP_SIP_E=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_E=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

 	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

 	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

 	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

 	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -5297,10 +5810,6 @@ DEP_CPP_SIP_E=\
 	"..\..\include\pjsip\sip_uri.h"\

 	"..\..\include\pjsip\sip_util.h"\

 	

-NODEP_CPP_SIP_E=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -5919,45 +6428,78 @@ NODEP_CPP_SIP_ER=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_ER=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

+	"..\..\..\pjlib\include\pj\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

+	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

+	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

+	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_errno.h"\

 	"..\..\include\pjsip\sip_msg.h"\

 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_ER=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -6498,38 +7040,73 @@ NODEP_CPP_SIP_M=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_M=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

+	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

+	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

+	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\print_util.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_errno.h"\

 	"..\..\include\pjsip\sip_msg.h"\

@@ -6537,10 +7114,6 @@ DEP_CPP_SIP_M=\
 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_M=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -7163,49 +7736,74 @@ NODEP_CPP_SIP_P=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_P=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\string.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

 	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

 	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

 	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

 	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

 	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\sip_auth_parser.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_errno.h"\

 	"..\..\include\pjsip\sip_msg.h"\

@@ -7214,10 +7812,6 @@ DEP_CPP_SIP_P=\
 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_P=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -7878,43 +8472,76 @@ NODEP_CPP_SIP_R=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_R=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\errno.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\srv_resolver.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

 	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

 	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_errno.h"\

 	"..\..\include\pjsip\sip_msg.h"\

@@ -7924,10 +8551,6 @@ DEP_CPP_SIP_R=\
 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_R=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -8539,41 +9162,74 @@ NODEP_CPP_SIP_T=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_T=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\string.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

 	"..\..\..\pjlib\include\pj\compat\ctype.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\errno.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

 	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

 	"..\..\..\pjlib\include\pj\ctype.h"\

+	"..\..\..\pjlib\include\pj\errno.h"\

 	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

+	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

+	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

+	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\print_util.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_msg.h"\

 	"..\..\include\pjsip\sip_parser.h"\

@@ -8581,10 +9237,6 @@ DEP_CPP_SIP_T=\
 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_T=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -9233,44 +9885,74 @@ NODEP_CPP_SIP_TR=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_TR=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

 	"..\..\..\pjlib\include\pj\guid.h"\

 	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -9285,10 +9967,6 @@ DEP_CPP_SIP_TR=\
 	"..\..\include\pjsip\sip_uri.h"\

 	"..\..\include\pjsip\sip_util.h"\

 	

-NODEP_CPP_SIP_TR=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -9975,44 +10653,74 @@ NODEP_CPP_SIP_TRA=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_TRA=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

 	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

 	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -10025,10 +10733,6 @@ DEP_CPP_SIP_TRA=\
 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_TRA=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -10697,43 +11401,75 @@ NODEP_CPP_SIP_TRAN=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_TRAN=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

 	"..\..\..\pjlib\include\pj\compat\socket.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

 	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -10745,10 +11481,6 @@ DEP_CPP_SIP_TRAN=\
 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_TRAN=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -11420,37 +12152,55 @@ DEP_CPP_SIP_TRANS=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_TRANS=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

 	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_powerpc.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

-	"..\..\..\pjlib\include\pj\compat\m_x86_64.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

 	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

 	"..\..\..\pjlib\include\pj\compat\socket.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

 	"..\..\..\pjlib\include\pj\lock.h"\

@@ -11458,12 +12208,19 @@ DEP_CPP_SIP_TRANS=\
 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

 	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -12140,43 +12897,75 @@ NODEP_CPP_SIP_TRANSP=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_TRANSP=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

 	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\socket.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

 	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -12184,13 +12973,10 @@ DEP_CPP_SIP_TRANSP=\
 	"..\..\include\pjsip\sip_parser.h"\

 	"..\..\include\pjsip\sip_resolve.h"\

 	"..\..\include\pjsip\sip_transport.h"\

+	"..\..\include\pjsip\sip_transport_udp.h"\

 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_TRANSP=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -12879,45 +13665,76 @@ NODEP_CPP_SIP_U=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_U=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

 	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\sip_auth.h"\

 	"..\..\include\pjsip\sip_auth_msg.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_dialog.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

@@ -12933,10 +13750,6 @@ DEP_CPP_SIP_U=\
 	"..\..\include\pjsip\sip_uri.h"\

 	"..\..\include\pjsip\sip_util.h"\

 	

-NODEP_CPP_SIP_U=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -13578,39 +14391,74 @@ NODEP_CPP_SIP_UR=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_UR=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\string.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

+	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

+	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

+	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\include\pjsip\print_util.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_errno.h"\

 	"..\..\include\pjsip\sip_msg.h"\

@@ -13618,10 +14466,6 @@ DEP_CPP_SIP_UR=\
 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	

-NODEP_CPP_SIP_UR=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -14265,45 +15109,74 @@ NODEP_CPP_SIP_UT=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_UT=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

 	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

 	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

 	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

 	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

 	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -14318,10 +15191,6 @@ DEP_CPP_SIP_UT=\
 	"..\..\include\pjsip\sip_uri.h"\

 	"..\..\include\pjsip\sip_util.h"\

 	

-NODEP_CPP_SIP_UT=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

@@ -14928,37 +15797,82 @@ NODEP_CPP_SIP_UTI=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_UTI=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\md5.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

+	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

+	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

+	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

+	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

+	"..\..\..\pjlib\include\pj\string.h"\

+	"..\..\..\pjlib\include\pj\string_i.h"\

+	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

+	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

 	"..\..\include\pjsip\sip_msg.h"\

+	"..\..\include\pjsip\sip_parser.h"\

 	"..\..\include\pjsip\sip_resolve.h"\

+	"..\..\include\pjsip\sip_transport.h"\

 	"..\..\include\pjsip\sip_types.h"\

 	"..\..\include\pjsip\sip_uri.h"\

 	"..\..\include\pjsip\sip_util.h"\

@@ -15547,40 +16461,74 @@ NODEP_CPP_SIP_UTIL=\
 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SIP_UTIL=\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

+	"..\..\..\pjlib\include\pj\addr_resolv.h"\

+	"..\..\..\pjlib\include\pj\array.h"\

 	"..\..\..\pjlib\include\pj\assert.h"\

 	"..\..\..\pjlib\include\pj\compat\assert.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_armcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_codew.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_gcc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_gcce.h"\

 	"..\..\..\pjlib\include\pj\compat\cc_msvc.h"\

+	"..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\

+	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

-	"..\..\..\pjlib\include\pj\compat\m_alpha.h"\

-	"..\..\..\pjlib\include\pj\compat\m_armv4.h"\

-	"..\..\..\pjlib\include\pj\compat\m_i386.h"\

-	"..\..\..\pjlib\include\pj\compat\m_m68k.h"\

-	"..\..\..\pjlib\include\pj\compat\m_sparc.h"\

+	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

 	"..\..\..\pjlib\include\pj\compat\os_palmos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_rtems.h"\

 	"..\..\..\pjlib\include\pj\compat\os_sunos.h"\

+	"..\..\..\pjlib\include\pj\compat\os_symbian.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32.h"\

 	"..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\

+	"..\..\..\pjlib\include\pj\compat\setjmp.h"\

 	"..\..\..\pjlib\include\pj\compat\size_t.h"\

+	"..\..\..\pjlib\include\pj\compat\stdarg.h"\

 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

+	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

+	"..\..\..\pjlib\include\pj\except.h"\

+	"..\..\..\pjlib\include\pj\fifobuf.h"\

+	"..\..\..\pjlib\include\pj\file_access.h"\

+	"..\..\..\pjlib\include\pj\file_io.h"\

+	"..\..\..\pjlib\include\pj\guid.h"\

+	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

+	"..\..\..\pjlib\include\pj\lock.h"\

+	"..\..\..\pjlib\include\pj\log.h"\

+	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

+	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

+	"..\..\..\pjlib\include\pj\rand.h"\

+	"..\..\..\pjlib\include\pj\rbtree.h"\

 	"..\..\..\pjlib\include\pj\sock.h"\

+	"..\..\..\pjlib\include\pj\sock_select.h"\

 	"..\..\..\pjlib\include\pj\string.h"\

 	"..\..\..\pjlib\include\pj\string_i.h"\

 	"..\..\..\pjlib\include\pj\timer.h"\

 	"..\..\..\pjlib\include\pj\types.h"\

+	"..\..\..\pjlib\include\pj\unicode.h"\

+	"..\..\..\pjlib\include\pjlib.h"\

+	"..\..\include\pjsip\sip_autoconf.h"\

 	"..\..\include\pjsip\sip_config.h"\

 	"..\..\include\pjsip\sip_endpoint.h"\

 	"..\..\include\pjsip\sip_errno.h"\

@@ -15595,10 +16543,6 @@ DEP_CPP_SIP_UTIL=\
 	"..\..\include\pjsip\sip_uri.h"\

 	"..\..\include\pjsip\sip_util.h"\

 	

-NODEP_CPP_SIP_UTIL=\

-	"..\..\..\pjlib\include\pj\compat\sprintf.h"\

-	"..\..\..\pjlib\include\pj\compat\vsprintf.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsip_core_wince - Win32 (WCE ARMV4) Debug"

 

diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h
index e72ab394..f54397a7 100644
--- a/pjsip/include/pjsip/sip_config.h
+++ b/pjsip/include/pjsip/sip_config.h
@@ -50,7 +50,7 @@
  */
 
 /**
- * @defgroup PJSIP_CONFIG Compile Time Configuration
+ * @defgroup PJSIP_CONFIG PJSIP Configurations/Settings
  * @ingroup PJSIP_BASE
  * @brief PJSIP compile time configurations.
  * @{
@@ -65,6 +65,75 @@
 
 
 /**
+ * This structure describes PJSIP run-time configurations/settings.
+ * Application may use #pjsip_cfg() function to modify the settings
+ * before creating the stack.
+ */
+typedef struct pjsip_cfg_t
+{
+    /** Transaction layer settings. */
+    struct {
+
+	/** Maximum number of transactions. The value is initialized with
+	 *  PJSIP_MAX_TSX_COUNT
+	 */
+	unsigned max_count;
+
+	/* Timeout values: */
+
+	/** Transaction T1 timeout, in msec. Default value is PJSIP_T1_TIMEOUT
+	 */
+	unsigned t1;
+
+	/** Transaction T2 timeout, in msec. Default value is PJSIP_T2_TIMEOUT
+	 */
+	unsigned t2;
+
+	/** Transaction completed timer for non-INVITE, in msec. Default value
+	 *  is PJSIP_T4_TIMEOUT
+	 */
+	unsigned t4;
+
+	/** Transaction completed timer for INVITE, in msec. Default value is
+	 *  PJSIP_TD_TIMEOUT.
+	 */
+	unsigned td;
+
+    } tsx;
+
+    /* Dialog layer settings .. TODO */
+
+} pjsip_cfg_t;
+
+
+#ifdef PJ_DLL
+/**
+ * Get pjsip configuration instance. Application may modify the
+ * settings before creating the SIP endpoint and modules.
+ *
+ * @return  Configuration instance.
+ */
+PJ_DECL(pjsip_cfg_t*) pjsip_cfg(void);
+
+#else	/* PJ_DLL */
+
+PJ_DECL_DATA(pjsip_cfg_t) pjsip_sip_cfg_var;
+
+/**
+ * Get pjsip configuration instance. Application may modify the
+ * settings before creating the SIP endpoint and modules.
+ *
+ * @return  Configuration instance.
+ */
+PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
+{
+    return &pjsip_sip_cfg_var;
+}
+
+#endif	/* PJ_DLL */
+
+
+/**
  * Specify maximum transaction count in transaction hash table.
  * Default value is 16*1024
  */
@@ -407,7 +476,8 @@
 
 
 /* Endpoint. */
-#define PJSIP_MAX_TIMER_COUNT		(2*PJSIP_MAX_TSX_COUNT + 2*PJSIP_MAX_DIALOG_COUNT)
+#define PJSIP_MAX_TIMER_COUNT		(2*pjsip_cfg()->tsx.max_count + \
+					 2*PJSIP_MAX_DIALOG_COUNT)
 
 /**
  * Initial memory block for the endpoint.
@@ -632,6 +702,7 @@
  * @}
  */
 
+
 #include <pj/config.h>
 
 
diff --git a/pjsip/src/pjsip-ua/sip_100rel.c b/pjsip/src/pjsip-ua/sip_100rel.c
index bca90947..9e4b7a5c 100644
--- a/pjsip/src/pjsip-ua/sip_100rel.c
+++ b/pjsip/src/pjsip-ua/sip_100rel.c
@@ -559,7 +559,7 @@ static void on_retransmit(pj_timer_heap_t *timer_heap,
     if (dd->uas_state->retransmit_count < 6) {
 	delay.sec = 0;
 	delay.msec = (1 << dd->uas_state->retransmit_count) * 
-		     PJSIP_T1_TIMEOUT;
+		     pjsip_cfg()->tsx.t1;
 	pj_time_val_normalize(&delay);
     } else {
 	delay.sec = 1;
diff --git a/pjsip/src/pjsip/sip_auth_client.c b/pjsip/src/pjsip/sip_auth_client.c
index bf09bad8..5730d6f2 100644
--- a/pjsip/src/pjsip/sip_auth_client.c
+++ b/pjsip/src/pjsip/sip_auth_client.c
@@ -23,6 +23,7 @@
 #include <pjsip/sip_transport.h>
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_errno.h>
+#include <pjsip/sip_util.h>
 #include <pjlib-util/md5.h>
 #include <pj/log.h>
 #include <pj/string.h>
diff --git a/pjsip/src/pjsip/sip_config.c b/pjsip/src/pjsip/sip_config.c
new file mode 100644
index 00000000..e0913792
--- /dev/null
+++ b/pjsip/src/pjsip/sip_config.c
@@ -0,0 +1,41 @@
+/* $Id$ */
+/* 
+ * Copyright (C) 2003-2007 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+
+#include <pjsip/sip_config.h>
+
+/* pjsip configuration instance, initialized with default values */
+PJ_DEF_DATA(pjsip_cfg_t) pjsip_sip_cfg_var =
+{
+    /* Transaction settings */
+    {
+       PJSIP_MAX_TSX_COUNT,
+       PJSIP_T1_TIMEOUT,
+       PJSIP_T2_TIMEOUT,
+       PJSIP_T4_TIMEOUT,
+       PJSIP_TD_TIMEOUT
+    }
+};
+
+
+#ifdef PJ_DLL
+PJ_DEF(pjsip_cfg_t*) pjsip_cfg(void)
+{
+    return &pjsip_sip_cfg_var;
+}
+#endif
diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c
index 61f85cef..ca767bb5 100644
--- a/pjsip/src/pjsip/sip_transaction.c
+++ b/pjsip/src/pjsip/sip_transaction.c
@@ -130,16 +130,16 @@ typedef struct tsx_lock_data {
 
 
 /* Timer timeout value constants */
-static const pj_time_val t1_timer_val = { PJSIP_T1_TIMEOUT/1000, 
-                                          PJSIP_T1_TIMEOUT%1000 };
-static const pj_time_val t2_timer_val = { PJSIP_T2_TIMEOUT/1000, 
-                                          PJSIP_T2_TIMEOUT%1000 };
-static const pj_time_val t4_timer_val = { PJSIP_T4_TIMEOUT/1000, 
-                                          PJSIP_T4_TIMEOUT%1000 };
-static const pj_time_val td_timer_val = { PJSIP_TD_TIMEOUT/1000, 
-                                          PJSIP_TD_TIMEOUT%1000 };
-static const pj_time_val timeout_timer_val = { (64*PJSIP_T1_TIMEOUT)/1000,
-					       (64*PJSIP_T1_TIMEOUT)%1000 };
+static pj_time_val t1_timer_val = { PJSIP_T1_TIMEOUT/1000, 
+                                    PJSIP_T1_TIMEOUT%1000 };
+static pj_time_val t2_timer_val = { PJSIP_T2_TIMEOUT/1000, 
+                                    PJSIP_T2_TIMEOUT%1000 };
+static pj_time_val t4_timer_val = { PJSIP_T4_TIMEOUT/1000, 
+                                    PJSIP_T4_TIMEOUT%1000 };
+static pj_time_val td_timer_val = { PJSIP_TD_TIMEOUT/1000, 
+                                    PJSIP_TD_TIMEOUT%1000 };
+static pj_time_val timeout_timer_val = { (64*PJSIP_T1_TIMEOUT)/1000,
+					 (64*PJSIP_T1_TIMEOUT)%1000 };
 
 #define TIMER_INACTIVE	0
 #define TIMER_ACTIVE	1
@@ -427,6 +427,18 @@ PJ_DEF(pj_status_t) pjsip_tsx_layer_init_module(pjsip_endpoint *endpt)
 
     PJ_ASSERT_RETURN(mod_tsx_layer.endpt==NULL, PJ_EINVALIDOP);
 
+    /* Initialize timer values */
+    t1_timer_val.sec  = pjsip_cfg()->tsx.t1 / 1000;
+    t1_timer_val.msec = pjsip_cfg()->tsx.t1 % 1000;
+    t2_timer_val.sec  = pjsip_cfg()->tsx.t2 / 1000;
+    t2_timer_val.msec = pjsip_cfg()->tsx.t2 % 1000;
+    t4_timer_val.sec  = pjsip_cfg()->tsx.t4 / 1000;
+    t4_timer_val.msec = pjsip_cfg()->tsx.t4 % 1000;
+    td_timer_val.sec  = pjsip_cfg()->tsx.td / 1000;
+    td_timer_val.msec = pjsip_cfg()->tsx.td % 1000;
+    timeout_timer_val.sec  = (64 * pjsip_cfg()->tsx.t1) / 1000;
+    timeout_timer_val.msec = (64 * pjsip_cfg()->tsx.t1) % 1000;
+
     /* Initialize TLS ID for transaction lock. */
     status = pj_thread_local_alloc(&pjsip_tsx_lock_tls_id);
     if (status != PJ_SUCCESS)
@@ -452,7 +464,7 @@ PJ_DEF(pj_status_t) pjsip_tsx_layer_init_module(pjsip_endpoint *endpt)
 
 
     /* Create hash table. */
-    mod_tsx_layer.htable = pj_hash_create( pool, PJSIP_MAX_TSX_COUNT );
+    mod_tsx_layer.htable = pj_hash_create( pool, pjsip_cfg()->tsx.max_count );
     if (!mod_tsx_layer.htable) {
 	pjsip_endpt_release_pool(endpt, pool);
 	return PJ_ENOMEM;
@@ -1867,25 +1879,28 @@ PJ_DEF(pj_status_t) pjsip_tsx_retransmit_no_state(pjsip_transaction *tsx,
 static void tsx_resched_retransmission( pjsip_transaction *tsx )
 {
     pj_time_val timeout;
-    int msec_time;
+    unsigned msec_time;
 
     pj_assert((tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) == 0);
 
     if (tsx->role==PJSIP_ROLE_UAC && tsx->status_code >= 100)
-	msec_time = PJSIP_T2_TIMEOUT;
+	msec_time = pjsip_cfg()->tsx.t2;
     else
-	msec_time = (1 << (tsx->retransmit_count)) * PJSIP_T1_TIMEOUT;
+	msec_time = (1 << (tsx->retransmit_count)) * pjsip_cfg()->tsx.t1;
 
     if (tsx->role == PJSIP_ROLE_UAC) {
 	pj_assert(tsx->status_code < 200);
 	/* Retransmission for non-INVITE transaction caps-off at T2 */
-	if (msec_time>PJSIP_T2_TIMEOUT && tsx->method.id!=PJSIP_INVITE_METHOD)
-	    msec_time = PJSIP_T2_TIMEOUT;
+	if (msec_time > pjsip_cfg()->tsx.t2 && 
+	    tsx->method.id != PJSIP_INVITE_METHOD)
+	{
+	    msec_time = pjsip_cfg()->tsx.t2;
+	}
     } else {
 	/* Retransmission of INVITE final response also caps-off at T2 */
 	pj_assert(tsx->status_code >= 200);
-	if (msec_time>PJSIP_T2_TIMEOUT)
-	    msec_time = PJSIP_T2_TIMEOUT;
+	if (msec_time > pjsip_cfg()->tsx.t2)
+	    msec_time = pjsip_cfg()->tsx.t2;
     }
 
     timeout.sec = msec_time / 1000;
diff --git a/pjsip/src/test-pjsip/tsx_uac_test.c b/pjsip/src/test-pjsip/tsx_uac_test.c
index 60b7bcee..a4a340de 100644
--- a/pjsip/src/test-pjsip/tsx_uac_test.c
+++ b/pjsip/src/test-pjsip/tsx_uac_test.c
@@ -614,11 +614,11 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
 	    msec_elapsed = now.sec*1000 + now.msec;
 
 	    ++recv_count;
-    	    msec_expected = (1<<(recv_count-2))*PJSIP_T1_TIMEOUT;
+    	    msec_expected = (1<<(recv_count-2))*pjsip_cfg()->tsx.t1;
 
 	    if (msg->line.req.method.id != PJSIP_INVITE_METHOD) {
-		if (msec_expected > PJSIP_T2_TIMEOUT)
-		    msec_expected = PJSIP_T2_TIMEOUT;
+		if (msec_expected > pjsip_cfg()->tsx.t2)
+		    msec_expected = pjsip_cfg()->tsx.t2;
 		max_received = 11;
 	    } else {
 		max_received = 7;
diff --git a/pjsip/src/test-pjsip/tsx_uas_test.c b/pjsip/src/test-pjsip/tsx_uas_test.c
index 7ca05a89..74c40c71 100644
--- a/pjsip/src/test-pjsip/tsx_uas_test.c
+++ b/pjsip/src/test-pjsip/tsx_uas_test.c
@@ -986,9 +986,9 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
 		PJ_TIME_VAL_SUB(now, recv_last);
 	    
 		msec = now.sec*1000 + now.msec;
-		msec_expected = (1 << (recv_count-2)) * PJSIP_T1_TIMEOUT;
-		if (msec_expected > PJSIP_T2_TIMEOUT)
-		    msec_expected = PJSIP_T2_TIMEOUT;
+		msec_expected = (1 << (recv_count-2)) * pjsip_cfg()->tsx.t1;
+		if (msec_expected > pjsip_cfg()->tsx.t2)
+		    msec_expected = pjsip_cfg()->tsx.t2;
 
 		if (DIFF(msec, msec_expected) > MAX_ALLOWED_DIFF) {
 		    PJ_LOG(3,(THIS_FILE,
@@ -1058,9 +1058,9 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
 		PJ_TIME_VAL_SUB(now, recv_last);
 	    
 		msec = now.sec*1000 + now.msec;
-		msec_expected = (1 << (recv_count-2)) * PJSIP_T1_TIMEOUT;
-		if (msec_expected > PJSIP_T2_TIMEOUT)
-		    msec_expected = PJSIP_T2_TIMEOUT;
+		msec_expected = (1 << (recv_count-2)) * pjsip_cfg()->tsx.t1;
+		if (msec_expected > pjsip_cfg()->tsx.t2)
+		    msec_expected = pjsip_cfg()->tsx.t2;
 
 		if (DIFF(msec, msec_expected) > MAX_ALLOWED_DIFF) {
 		    PJ_LOG(3,(THIS_FILE,