Turn COMPILED_FROM_DSP into COMPILING_FOR_WINDOWS

.. since it is used with that semantic by now

diff --git a/expat/bcb5/expat.bpr b/expat/bcb5/expat.bpr
index 7aff450b0eed7b8761fb406882eef1b8a26dbd55..8a80a984799a69a01307d98be755995a65f31a45 100644 (file)
--- a/expat/bcb5/expat.bpr
+++ b/expat/bcb5/expat.bpr
@@ -25,7 +25,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS"/>
+    <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILING_FOR_WINDOWS;EXPAT_EXPORTS"/>
     <SYSDEFINES value="_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
     <MAINSOURCE value="expat.bpf"/>
     <INCLUDEPATH value="..\lib;$(BCB)\include"/>
@@ -94,14 +94,14 @@ Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
 Count=8
-Item0=_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS
-Item1=_WINDOWS;WIN32;NDEBUG;_DEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS
-Item2=WIN32;_WINDOWS;NDEBUG;_DEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS
-Item3=WIN32;_WINDOWS;NDEBUG;_DEBUG;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP
-Item4=NDEBUG;WIN32;_WINDOWS;_USRDLL;_DEBUG;EXPAT_EXPORTS;COMPILED_FROM_DSP
-Item5=NDEBUG;WIN32;_WINDOWS;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP;_DEBUG
-Item6=NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP;_DEBUG
-Item7=NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP
+Item0=_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILING_FOR_WINDOWS;EXPAT_EXPORTS
+Item1=_WINDOWS;WIN32;NDEBUG;_DEBUG;_USRDLL;COMPILING_FOR_WINDOWS;EXPAT_EXPORTS
+Item2=WIN32;_WINDOWS;NDEBUG;_DEBUG;_USRDLL;COMPILING_FOR_WINDOWS;EXPAT_EXPORTS
+Item3=WIN32;_WINDOWS;NDEBUG;_DEBUG;_USRDLL;EXPAT_EXPORTS;COMPILING_FOR_WINDOWS
+Item4=NDEBUG;WIN32;_WINDOWS;_USRDLL;_DEBUG;EXPAT_EXPORTS;COMPILING_FOR_WINDOWS
+Item5=NDEBUG;WIN32;_WINDOWS;_USRDLL;EXPAT_EXPORTS;COMPILING_FOR_WINDOWS;_DEBUG
+Item6=NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;COMPILING_FOR_WINDOWS;_DEBUG
+Item7=NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;COMPILING_FOR_WINDOWS
 
 [HistoryLists\hlIntOutputDir]
 Count=7

diff --git a/expat/bcb5/expat.mak b/expat/bcb5/expat.mak
index 7c9c23f52b86d53824473b5ef58f6be857ff0a69..fd7e26f5afd19d89b474c4538377d8e20bd7110b 100644 (file)
--- a/expat/bcb5/expat.mak
+++ b/expat/bcb5/expat.mak
@@ -36,7 +36,7 @@ PATHPAS = .;
 PATHRC = .;
 DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = _WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILED_FROM_DSP
+USERDEFINES = _WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILING_FOR_WINDOWS
 SYSDEFINES = _NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
 INCLUDEPATH = ..\lib;$(BCB)\include
 LIBPATH = ..\lib;$(BCB)\lib;$(RELEASELIBPATH)

diff --git a/expat/bcb5/expat_static.bpr b/expat/bcb5/expat_static.bpr
index 0b78ec891284872b60fe0b1d328c75e0a65aa5bd..3a3d6ad2cd1e90b7be03f6d9a3761d812f0e869e 100644 (file)
--- a/expat/bcb5/expat_static.bpr
+++ b/expat/bcb5/expat_static.bpr
@@ -23,7 +23,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC"/>
+    <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC"/>
     <SYSDEFINES value="_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
     <MAINSOURCE value="expat_static.bpf"/>
     <INCLUDEPATH value="..\lib;$(BCB)\include"/>
@@ -93,13 +93,13 @@ Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
 Count=7
-Item0=_WINDOWS;WIN32;NDEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC
-Item1=_WINDOWS;WIN32;NDEBUG;_DEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC
-Item2=WIN32;_WINDOWS;NDEBUG;_DEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC
-Item3=WIN32;_WINDOWS;NDEBUG;_LIB;COMPILED_FROM_DSP;_DEBUG
-Item4=WIN32;_WINDOWS;NDEBUG;_LIB;COMPILED_FROM_DSP
-Item5=WIN32;_WINDOWS;NDEBUG;_LIB;COMPILED_FROM_DSP;_MBCS
-Item6=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP
+Item0=_WINDOWS;WIN32;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC
+Item1=_WINDOWS;WIN32;NDEBUG;_DEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC
+Item2=WIN32;_WINDOWS;NDEBUG;_DEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC
+Item3=WIN32;_WINDOWS;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;_DEBUG
+Item4=WIN32;_WINDOWS;NDEBUG;_LIB;COMPILING_FOR_WINDOWS
+Item5=WIN32;_WINDOWS;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;_MBCS
+Item6=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILING_FOR_WINDOWS
 
 [HistoryLists\hlIntOutputDir]
 Count=6

diff --git a/expat/bcb5/expat_static.mak b/expat/bcb5/expat_static.mak
index 9137d3b534615d46df95125f54bf6c433fe98a97..3ae1733a9361ca1eefc6ed375cf854faa95f0cc8 100644 (file)
--- a/expat/bcb5/expat_static.mak
+++ b/expat/bcb5/expat_static.mak
@@ -35,7 +35,7 @@ PATHRC = .;
 LINKER = TLib
 DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = _WINDOWS;WIN32;NDEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC
+USERDEFINES = _WINDOWS;WIN32;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC
 SYSDEFINES = _NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
 INCLUDEPATH = ..\lib;$(BCB)\include
 LIBPATH = ..\lib;$(BCB)\lib;$(RELEASELIBPATH)

diff --git a/expat/bcb5/expatw.bpr b/expat/bcb5/expatw.bpr
index a9c9f75cf3f7896351c3b4be87acd93386aaa30f..5cd1e0cee8f8fcf949f0cdb6de8c877ceb32e09e 100644 (file)
--- a/expat/bcb5/expatw.bpr
+++ b/expat/bcb5/expatw.bpr
@@ -25,7 +25,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T"/>
+    <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILING_FOR_WINDOWS;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T"/>
     <SYSDEFINES value="_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
     <MAINSOURCE value="expatw.bpf"/>
     <INCLUDEPATH value="..\lib;$(BCB)\include"/>
@@ -94,15 +94,15 @@ Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
 Count=9
-Item0=_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
-Item1=_WINDOWS;WIN32;NDEBUG;_DEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
-Item2=_WINDOWS;WIN32;NDEBUG;_DEBUG;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T
-Item3=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;EXPAT_EXPORTS;_DEBUG;XML_UNICODE_WCHAR_T
-Item4=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;_DEBUG
-Item5=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_UNICODE;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;_DEBUG
-Item6=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_UNICODE;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
-Item7=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;XML_UNICODE
-Item8=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
+Item0=_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILING_FOR_WINDOWS;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
+Item1=_WINDOWS;WIN32;NDEBUG;_DEBUG;_USRDLL;COMPILING_FOR_WINDOWS;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
+Item2=_WINDOWS;WIN32;NDEBUG;_DEBUG;_USRDLL;EXPAT_EXPORTS;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T
+Item3=NDEBUG;COMPILING_FOR_WINDOWS;WIN32;_WINDOWS;_USRDLL;EXPAT_EXPORTS;_DEBUG;XML_UNICODE_WCHAR_T
+Item4=NDEBUG;COMPILING_FOR_WINDOWS;WIN32;_WINDOWS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;_DEBUG
+Item5=NDEBUG;COMPILING_FOR_WINDOWS;WIN32;_WINDOWS;_UNICODE;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;_DEBUG
+Item6=NDEBUG;COMPILING_FOR_WINDOWS;WIN32;_WINDOWS;_UNICODE;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
+Item7=NDEBUG;COMPILING_FOR_WINDOWS;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;XML_UNICODE
+Item8=NDEBUG;COMPILING_FOR_WINDOWS;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T
 
 [HistoryLists\hlIntOutputDir]
 Count=8

diff --git a/expat/bcb5/expatw.mak b/expat/bcb5/expatw.mak
index 08e17d003b8c10afc14065d4f71c49366c311c5f..47b9fe8cd5d7ce2d1c6d90502af5b07678cc1661 100644 (file)
--- a/expat/bcb5/expatw.mak
+++ b/expat/bcb5/expatw.mak
@@ -36,7 +36,7 @@ PATHPAS = .;
 PATHRC = .;
 DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = _WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T
+USERDEFINES = _WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T
 SYSDEFINES = _NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
 INCLUDEPATH = ..\lib;$(BCB)\include
 LIBPATH = ..\lib;$(BCB)\lib;$(RELEASELIBPATH)

diff --git a/expat/bcb5/expatw_static.bpr b/expat/bcb5/expatw_static.bpr
index 457acc7c1ad73108c4b78e54d0addea99c0d5e6b..96ee9945c14840b5881ea42e719cb43ebca8b9ec 100644 (file)
--- a/expat/bcb5/expatw_static.bpr
+++ b/expat/bcb5/expatw_static.bpr
@@ -23,7 +23,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC;XML_UNICODE_WCHAR_T"/>
+    <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC;XML_UNICODE_WCHAR_T"/>
     <SYSDEFINES value="_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
     <MAINSOURCE value="expatw_static.bpf"/>
     <INCLUDEPATH value="..\lib;$(BCB)\include"/>
@@ -94,21 +94,21 @@ Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
 Count=15
-Item0=_WINDOWS;WIN32;NDEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC;XML_UNICODE_WCHAR_T
-Item1=_WINDOWS;WIN32;NDEBUG;_DEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC;XML_UNICODE_WCHAR_T
-Item2=WIN32;_WINDOWS;NDEBUG;_DEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC;XML_UNICODE_WCHAR_T
-Item3=WIN32;_WINDOWS;NDEBUG;_DEBUG;_LIB;XML_STATIC;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T
-Item4=WIN32;_WINDOWS;NDEBUG;_LIB;COMPILED_FROM_DSP;_DEBUG;XML_UNICODE_WCHAR_T
-Item5=WIN32;_WINDOWS;NDEBUG;_UNICODE;_LIB;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T;_DEBUG
-Item6=WIN32;_WINDOWS;NDEBUG;_UNICODE;_LIB;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T;_DEBUG;__cplusplus
-Item7=WIN32;_WINDOWS;NDEBUG;_UNICODE;_LIB;COMPILED_FROM_DSP;XML_UNICODE;_DEBUG
-Item8=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP;XML_UNICODE;_DEBUG
-Item9=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T;_DEBUG;__WCHAR_T
-Item10=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T;_DEBUG;_UNICODE
-Item11=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP;XML_UNICODE;_DEBUG;_UNICODE
-Item12=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T;_DEBUG
-Item13=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T
-Item14=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILED_FROM_DSP;XML_UNICODE_WCHAR_T;XML_UNICODE
+Item0=_WINDOWS;WIN32;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC;XML_UNICODE_WCHAR_T
+Item1=_WINDOWS;WIN32;NDEBUG;_DEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC;XML_UNICODE_WCHAR_T
+Item2=WIN32;_WINDOWS;NDEBUG;_DEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC;XML_UNICODE_WCHAR_T
+Item3=WIN32;_WINDOWS;NDEBUG;_DEBUG;_LIB;XML_STATIC;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T
+Item4=WIN32;_WINDOWS;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;_DEBUG;XML_UNICODE_WCHAR_T
+Item5=WIN32;_WINDOWS;NDEBUG;_UNICODE;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T;_DEBUG
+Item6=WIN32;_WINDOWS;NDEBUG;_UNICODE;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T;_DEBUG;__cplusplus
+Item7=WIN32;_WINDOWS;NDEBUG;_UNICODE;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE;_DEBUG
+Item8=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE;_DEBUG
+Item9=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T;_DEBUG;__WCHAR_T
+Item10=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T;_DEBUG;_UNICODE
+Item11=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE;_DEBUG;_UNICODE
+Item12=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T;_DEBUG
+Item13=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T
+Item14=WIN32;_WINDOWS;NDEBUG;_MBCS;_LIB;COMPILING_FOR_WINDOWS;XML_UNICODE_WCHAR_T;XML_UNICODE
 
 [HistoryLists\hlIntOutputDir]
 Count=6

diff --git a/expat/bcb5/expatw_static.mak b/expat/bcb5/expatw_static.mak
index 16b7e5b90ec7907505b6817d7eda7e0fec20ba75..156adebaf597309924fcbe33fc0fac7f09d7c963 100644 (file)
--- a/expat/bcb5/expatw_static.mak
+++ b/expat/bcb5/expatw_static.mak
@@ -35,7 +35,7 @@ PATHRC = .;
 LINKER = TLib
 DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = _WINDOWS;WIN32;NDEBUG;_LIB;COMPILED_FROM_DSP;XML_STATIC;XML_UNICODE_WCHAR_T
+USERDEFINES = _WINDOWS;WIN32;NDEBUG;_LIB;COMPILING_FOR_WINDOWS;XML_STATIC;XML_UNICODE_WCHAR_T
 SYSDEFINES = _NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
 INCLUDEPATH = ..\lib;$(BCB)\include
 LIBPATH = ..\lib;$(BCB)\lib;$(RELEASELIBPATH)

diff --git a/expat/bcb5/xmlwf.bpr b/expat/bcb5/xmlwf.bpr
index bc765863d8626ddde13e3b364b259652c31eceba..bd7a6350ea28fa77fedc9337324630422f55e0a6 100644 (file)
--- a/expat/bcb5/xmlwf.bpr
+++ b/expat/bcb5/xmlwf.bpr
@@ -25,7 +25,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP"/>
+    <USERDEFINES value="NDEBUG;WIN32;_CONSOLE;COMPILING_FOR_WINDOWS"/>
     <SYSDEFINES value="_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
     <MAINSOURCE value="xmlwf.bpf"/>
     <INCLUDEPATH value="..\xmlwf;$(BCB)\include"/>
@@ -94,12 +94,12 @@ Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
 Count=6
-Item0=NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP
-Item1=NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP;_DEBUG;XML_UNICODE_WCHAR_T;_UNICODE
-Item2=NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP;_DEBUG;XML_UNICODE_WCHAR_T
-Item3=NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP;_DEBUG
-Item4=NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP;_DEBUG;_UNICODE;XML_UNICODE_WCHAR_T
-Item5=NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP;_DEBUG;_UNICODE
+Item0=NDEBUG;WIN32;_CONSOLE;COMPILING_FOR_WINDOWS
+Item1=NDEBUG;WIN32;_CONSOLE;COMPILING_FOR_WINDOWS;_DEBUG;XML_UNICODE_WCHAR_T;_UNICODE
+Item2=NDEBUG;WIN32;_CONSOLE;COMPILING_FOR_WINDOWS;_DEBUG;XML_UNICODE_WCHAR_T
+Item3=NDEBUG;WIN32;_CONSOLE;COMPILING_FOR_WINDOWS;_DEBUG
+Item4=NDEBUG;WIN32;_CONSOLE;COMPILING_FOR_WINDOWS;_DEBUG;_UNICODE;XML_UNICODE_WCHAR_T
+Item5=NDEBUG;WIN32;_CONSOLE;COMPILING_FOR_WINDOWS;_DEBUG;_UNICODE
 
 [HistoryLists\hlIntOutputDir]
 Count=3

diff --git a/expat/bcb5/xmlwf.mak b/expat/bcb5/xmlwf.mak
index f74126e454aa5a6148ac585e0e5b50b191ba0e99..0a6674488e4931d1bad3c58ee0edf45c7c733668 100644 (file)
--- a/expat/bcb5/xmlwf.mak
+++ b/expat/bcb5/xmlwf.mak
@@ -36,7 +36,7 @@ PATHPAS = .;
 PATHRC = .;
 DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP
+USERDEFINES = NDEBUG;WIN32;_CONSOLE;COMPILING_FOR_WINDOWS
 SYSDEFINES = _NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
 INCLUDEPATH = ..\xmlwf;$(BCB)\include
 LIBPATH = ..\xmlwf;$(BCB)\lib;$(RELEASELIBPATH)

diff --git a/expat/lib/expat.dsp b/expat/lib/expat.dsp
index 6440d37f5bb3085b670820cdfa0df378b73d714f..347ca2ade1692ec5dbbc2b33330c89338caabd90 100644 (file)
--- a/expat/lib/expat.dsp
+++ b/expat/lib/expat.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILED_FROM_DSP" /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILING_FOR_WINDOWS" /FD /c\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILING_FOR_WINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r

diff --git a/expat/lib/expat_static.dsp b/expat/lib/expat_static.dsp
index ca39bc073d9891ab3b9d1754071a1a56a8ec0b13..33e1a0b5913c1d36e98117431a6f883c02e607c4 100644 (file)
--- a/expat/lib/expat_static.dsp
+++ b/expat/lib/expat_static.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "..\win32\tmp\Release_static"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILING_FOR_WINDOWS" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x1009 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "..\win32\tmp\Debug_static"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "COMPILED_FROM_DSP" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "COMPILING_FOR_WINDOWS" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x1009 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r

diff --git a/expat/lib/expatw.dsp b/expat/lib/expatw.dsp
index 77497b58db8517acdc7be170005bfa001c666390..89106e655800ac4795901dffe2da0ca2a60c7086 100644 (file)
--- a/expat/lib/expatw.dsp
+++ b/expat/lib/expatw.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_UNICODE_WCHAR_T" /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "COMPILING_FOR_WINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_UNICODE_WCHAR_T" /FD /c\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILING_FOR_WINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r

diff --git a/expat/lib/expatw_static.dsp b/expat/lib/expatw_static.dsp
index f13dd72978a65df4123dbe90a828a11b887a97fd..a464a8292212a98ca201dbfbcfe30011d644a1da 100644 (file)
--- a/expat/lib/expatw_static.dsp
+++ b/expat/lib/expatw_static.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "..\win32\tmp\Release-w_static"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILING_FOR_WINDOWS" /D "XML_UNICODE_WCHAR_T" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x1009 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "..\win32\tmp\Debug-w_static"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "COMPILING_FOR_WINDOWS" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x1009 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index c9c7a9b2c7ae0243bad63ddb8c5d992a713db1c1..73dcc7886f7d2c9a2dab5e74c73a64490438e6f2 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -12,7 +12,7 @@
 
 #define XML_BUILDING_EXPAT 1
 
-#ifdef COMPILED_FROM_DSP
+#ifdef COMPILING_FOR_WINDOWS
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
@@ -22,7 +22,7 @@
 #include "watcomconfig.h"
 #elif defined(HAVE_EXPAT_CONFIG_H)
 #include <expat_config.h>
-#endif /* ndef COMPILED_FROM_DSP */
+#endif /* ndef COMPILING_FOR_WINDOWS */
 
 #include "ascii.h"
 #include "expat.h"

diff --git a/expat/lib/xmlrole.c b/expat/lib/xmlrole.c
index 44772e21dd337b00e3fc53b1626721672ab08102..f6e66ab644a32767b5c0cc38fe5dc875eab421fc 100644 (file)
--- a/expat/lib/xmlrole.c
+++ b/expat/lib/xmlrole.c
@@ -4,7 +4,7 @@
 
 #include <stddef.h>
 
-#ifdef COMPILED_FROM_DSP
+#ifdef COMPILING_FOR_WINDOWS
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
@@ -16,7 +16,7 @@
 #ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
 #endif
-#endif /* ndef COMPILED_FROM_DSP */
+#endif /* ndef COMPILING_FOR_WINDOWS */
 
 #include "expat_external.h"
 #include "internal.h"

diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index bf09dfc72b9fc85384f06850284d21c96ebc1cfa..5d1d2b422a024829c8137b680e7e2dbe66713ee6 100644 (file)
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -4,7 +4,7 @@
 
 #include <stddef.h>
 
-#ifdef COMPILED_FROM_DSP
+#ifdef COMPILING_FOR_WINDOWS
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
@@ -16,7 +16,7 @@
 #ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
 #endif
-#endif /* ndef COMPILED_FROM_DSP */
+#endif /* ndef COMPILING_FOR_WINDOWS */
 
 #include "expat_external.h"
 #include "internal.h"

diff --git a/expat/tests/runtests.dsp b/expat/tests/runtests.dsp
index a5aa23426f11e62f5d6407acb347edce2fa87cec..e9965cac688e513229190e4492bc70b891b5576f 100644 (file)
--- a/expat/tests/runtests.dsp
+++ b/expat/tests/runtests.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "COMPILED_FROM_DSP" /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "COMPILING_FOR_WINDOWS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x1009 /d "NDEBUG"
 # ADD RSC /l 0x1009 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "COMPILED_FROM_DSP" /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "COMPILING_FOR_WINDOWS" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x1009 /d "_DEBUG"
 # ADD RSC /l 0x1009 /d "_DEBUG"

diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index 99eeeaaef28d37fad03dc3df2a6abe6d249c0edf..86880f2cd76bee893e3ea3634dc61c92b1a16acb 100644 (file)
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-#ifdef COMPILED_FROM_DSP
+#ifdef COMPILING_FOR_WINDOWS
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
@@ -18,7 +18,7 @@
 #include "watcomconfig.h"
 #elif defined(HAVE_EXPAT_CONFIG_H)
 #include <expat_config.h>
-#endif /* ndef COMPILED_FROM_DSP */
+#endif /* ndef COMPILING_FOR_WINDOWS */
 
 #include "expat.h"
 #include "xmlfile.h"

diff --git a/expat/xmlwf/xmlwf.dsp b/expat/xmlwf/xmlwf.dsp
index 52f4eec71ffa375c0a7ba5e0673a5cbfed0642f0..3af1abb2cc957a4942776f9c060352a4fabc3f2e 100755 (executable)
--- a/expat/xmlwf/xmlwf.dsp
+++ b/expat/xmlwf/xmlwf.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir "."\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "COMPILED_FROM_DSP" /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "COMPILING_FOR_WINDOWS" /FD /c\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir "."\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c\r
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "COMPILED_FROM_DSP" /FD /c\r
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "COMPILING_FOR_WINDOWS" /FD /c\r
 # SUBTRACT CPP /Fr /YX\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r