diff --git a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
index d2e9e3d117fdad5f5a5f25baf04573f453de56bc..016bdd9dbf24c51bc1bbb18be6c1aa366efc3910 100644
--- a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
+++ b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
@@ -370,7 +370,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="PLATFORM_WIN32;_CRTDBG_MAP_ALLOC;PROJ_XMLPARSER;PROJ_XMLUTIL;PROJ_PARSERS;PROJ_SAX4C;PROJ_SAX2;PROJ_DOM;PROJ_VALIDATORS;XML_SINGLEDLL;XML_USE_WIN32_TRANSCODER;XML_USE_INMEM_MESSAGELOADER;XML_USE_NETACCESSOR_WINSOCK;_DEBUG;PROJ_DEPRECATED_DOM"/>
+ <USERDEFINES value="XML_PLATFORM_NEW_BLOCK_ALIGNMENT=4;PLATFORM_WIN32;_CRTDBG_MAP_ALLOC;PROJ_XMLPARSER;PROJ_XMLUTIL;PROJ_PARSERS;PROJ_SAX4C;PROJ_SAX2;PROJ_DOM;PROJ_VALIDATORS;XML_SINGLEDLL;XML_USE_WIN32_TRANSCODER;XML_USE_INMEM_MESSAGELOADER;XML_USE_NETACCESSOR_WINSOCK;_DEBUG;PROJ_DEPRECATED_DOM"/>
<SYSDEFINES value="NO_STRICT;_RTLDLL;USEPACKAGES"/>
<MAINSOURCE value="Xerceslib.cpp"/>
<INCLUDEPATH value="..\..\..\..\..\src;$(BCB)\include"/>
diff --git a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.mak
index fda5ff1801363d0583053d602758fce8caf7f167..a2ebe9f7e9297dc25b4bbb9af202faddf062d50e 100644
--- a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.mak
@@ -344,7 +344,12 @@ OBJFILES = ..\..\..\..\..\Build\Win32\BCB6\obj\Xerceslib.obj \
..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathException.obj \
..\..\..\..\..\Build\Win32\BCB6\obj\XSObjectFactory.obj \
..\..\..\..\..\Build\Win32\BCB6\obj\XMLIBM1047Transcoder.obj\
- ..\..\..\..\..\Build\Win32\BCB6\obj\XMLCanRepGroup.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XMLCanRepGroup.obj\
+ ..\..\..\..\..\Build\Win32\BCB6\obj\BinMemOutputStream.obj\
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XMLRegisterCleanup.obj\
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XSValue.obj\
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XSAXMLScanner.obj\
+ ..\..\..\..\..\Build\Win32\BCB6\obj\IdentityConstraintHandler.obj"
RESFILES = ..\..\..\..\..\src\xercesc\util\Platforms\Win32\Version.res
MAINSOURCE = Xerceslib.cpp
RESDEPEN = $(RESFILES)
@@ -359,7 +364,7 @@ OTHERFILES =
# ---------------------------------------------------------------------------
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = PLATFORM_WIN32;_CRTDBG_MAP_ALLOC;PROJ_XMLPARSER;PROJ_XMLUTIL;PROJ_PARSERS;PROJ_SAX4C;PROJ_SAX2;PROJ_DOM;PROJ_VALIDATORS;XML_SINGLEDLL;XML_USE_WIN32_TRANSCODER;XML_USE_WIN32_MSGLOADER;XML_USE_NETACCESSOR_WINSOCK;_DEBUG
+USERDEFINES = XML_PLATFORM_NEW_BLOCK_ALIGNMENT=4;PLATFORM_WIN32;_CRTDBG_MAP_ALLOC;PROJ_XMLPARSER;PROJ_XMLUTIL;PROJ_PARSERS;PROJ_SAX4C;PROJ_SAX2;PROJ_DOM;PROJ_VALIDATORS;XML_SINGLEDLL;XML_USE_WIN32_TRANSCODER;XML_USE_WIN32_MSGLOADER;XML_USE_NETACCESSOR_WINSOCK;_DEBUG
SYSDEFINES = NO_STRICT;_RTLDLL;USEPACKAGES
INCLUDEPATH = ..\..\..\..\..\src;$(BCB)\include
LIBPATH = ..\..\..\..\..\src;$(BCB)\lib\obj;$(BCB)\lib
@@ -371,11 +376,11 @@ PATHRC = .;..\..\..\..\..\src\xercesc\util\Platforms\Win32
PATHOBJ = .;$(LIBPATH)
# ---------------------------------------------------------------------------
CFLAG1 = -WD -Od -Q -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWD -tWM -c
-IDLCFLAGS = -I..\..\..\..\..\src\xercesc -I$(BCB)\include -src_suffix cpp \
+IDLCFLAGS = -I..\..\..\..\..\src -I$(BCB)\include -src_suffix cpp \
-DPLATFORM_WIN32 -D_CRTDBG_MAP_ALLOC -DPROJ_XMLPARSER -DPROJ_XMLUTIL \
-DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_VALIDATORS \
-DXML_SINGLEDLL -DXML_USE_WIN32_TRANSCODER -DXML_USE_WIN32_MSGLOADER \
- -DXML_USE_NETACCESSOR_WINSOCK -D_DEBUG -boa
+ -DXML_USE_NETACCESSOR_WINSOCK -D_DEBUG -DPROJ_DEPRECATED_DOM -boa
PFLAGS = -N2..\..\..\..\..\Build\Win32\BCB6\obj \
-N0..\..\..\..\..\Build\Win32\BCB6\obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M
RFLAGS =
diff --git a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
index 09ff57eb2960ab1fbb62dc593f2fbbc82f208366..e52c773b2f36ca84f1c65d2c5da28c8e53ceb051 100644
--- a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
@@ -8,6 +8,7 @@ TARGETPATH=..\..\..\..\..\Build\Win32\BCC.551
PROJECT = $(TARGETPATH)\xerces-bor_$(XERCESVER).dll
!if $d(WITHDEPRDOM)
DEPRDOM_PATH=..\..\..\..\..\src\xercesc\dom\deprecated
+DEPRDOM_DEFINE=;PROJ_DEPRECATED_DOM
DEPRDOM_OBJFILES = \
$(TARGETPATH)\obj\AttrImpl.obj \
$(TARGETPATH)\obj\AttrMapImpl.obj \
@@ -356,6 +357,10 @@ OBJFILES = $(TARGETPATH)\obj\XercesLib.obj \
$(TARGETPATH)\obj\XMLIBM1047Transcoder.obj \
$(TARGETPATH)\obj\XMLCanRepGroup.obj \
$(TARGETPATH)\obj\BinMemOutputStream.obj \
+ $(TARGETPATH)\obj\XSValue.obj \
+ $(TARGETPATH)\obj\IdentityConstraintHandler.obj \
+ $(TARGETPATH)\obj\XSAXMLScanner.obj \
+ $(TARGETPATH)\obj\XMLRegisterCleanup.obj \
$(DEPRDOM_OBJFILES)
RESFILES = $(TARGETPATH)\obj\Version.res
MAINSOURCE = XercesLib.cpp
@@ -374,7 +379,7 @@ PATHRC = .;..\..\..\..\..\src\xercesc\util\Platforms\Win32
!if !$d(WITHASM)
XERCES_NO_ASM=;XERCES_NO_ASM
!endif
-USERDEFINES = _DEBUG;PLATFORM_WIN32;_CRTDBG_MAP_ALLOC;PROJ_XMLPARSER;PROJ_XMLUTIL;PROJ_PARSERS;PROJ_SAX4C;PROJ_SAX2;PROJ_DOM;PROJ_VALIDATORS;XML_SINGLEDLL;XML_USE_WIN32_TRANSCODER;XML_USE_INMEM_MESSAGELOADER;XML_USE_NETACCESSOR_WINSOCK$(XERCES_NO_ASM)
+USERDEFINES = XML_PLATFORM_NEW_BLOCK_ALIGNMENT=4;_DEBUG;PLATFORM_WIN32;_CRTDBG_MAP_ALLOC;PROJ_XMLPARSER;PROJ_XMLUTIL;PROJ_PARSERS;PROJ_SAX4C;PROJ_SAX2;PROJ_DOM;PROJ_VALIDATORS;XML_SINGLEDLL;XML_USE_WIN32_TRANSCODER;XML_USE_INMEM_MESSAGELOADER;XML_USE_NETACCESSOR_WINSOCK$(DEPRDOM_DEFINE)$(XERCES_NO_ASM)
SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Platforms\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)
LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Platforms\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)