Remove GC_BUILD definition from build scripts

* CMakeLists.txt (ADD_DEFINITIONS): Remove -D GC_BUILD (not
needed since it is defined in gc_priv.h, gc_pmark.h and
gc_cpp.cc).
* WCC_MAKEFILE (CFLAGS): Likewise.
* build/s60v3/libgc.mmp: Likewise.
* digimars.mak (DEFINES, tests/test.obj): Likewise.
* windows-untested/vc60/gc.dsp (ADD CPP): Likewise.
* windows-untested/vc60/libgc.dsp (ADD CPP): Likewise.
* windows-untested/vc60/libgcmt.dsp (ADD CPP): Likewise.
* windows-untested/vc70/gc.vcproj (PreprocessorDefinitions): Likewise.
* windows-untested/vc70/libgc.vcproj (PreprocessorDefinitions):
Likewise.
* windows-untested/vc70/libgcmt.vcproj (PreprocessorDefinitions):
Likewise.
* windows-untested/vc71/gc.vcproj (PreprocessorDefinitions): Likewise.
* windows-untested/vc71/libgc.vcproj (PreprocessorDefinitions):
Likewise.
* windows-untested/vc71/libgcmt.vcproj (PreprocessorDefinitions):
Likewise.
* extra/MacOS.c: Define GC_BUILD (before include of gc.h).
* extra/msvc_dbg.c: Likewise.
* windows-untested/vc60/gc.dsp (MESSAGE, ENDIF): Remove trailing
spaces at EOLn.
* windows-untested/vc60/libgc.dsp (MESSAGE, ENDIF): Likewise.
* windows-untested/vc60/libgcmt.dsp (MESSAGE, ENDIF): Likewise.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d537b8a8465896ea49594f2a6e300cd9bbca395a..a19cabb4d8c26b364dde527e4bb4c037485006d3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,7 @@ PROJECT(gc)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 ADD_DEFINITIONS("-D_CRT_SECURE_NO_DEPRECATE
-                 -DALL_INTERIOR_POINTERS
-                 -DGC_BUILD
-")
+                 -DALL_INTERIOR_POINTERS")
 
 IF(APPLE)
     SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE)

diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE
index d1cca27afeb4866f7eba213a2299c0d8db42d467..0257f71584a437fdfefa25f2bfc39041e7377e1e 100644 (file)
--- a/WCC_MAKEFILE
+++ b/WCC_MAKEFILE
@@ -67,7 +67,7 @@ CC=wcc386
 CXX=wpp386
 
 # -DUSE_GENERIC is required !
-CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(DLLFLAG) -DGC_BUILD -DUSE_GENERIC $(DEFS)
+CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(DLLFLAG) -DUSE_GENERIC $(DEFS)
 CXXFLAGS= $(CFLAGS)
 TEST_CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(TEST_DLLFLAG) $(DEFS)
 TEST_CXXFLAGS= $(TEST_CFLAGS)

diff --git a/build/s60v3/libgc.mmp b/build/s60v3/libgc.mmp
index df3b5c81778bb02ece2257c798379ffcb6c45038..8c0dcab5880c5be57978cc4f9977266ec5d2aa29 100644 (file)
--- a/build/s60v3/libgc.mmp
+++ b/build/s60v3/libgc.mmp
@@ -20,7 +20,6 @@ MACRO NO_EXECUTE_PERMISSION
 MACRO USE_MMAP
 MACRO GC_DONT_REGISTER_MAIN_STATIC_DATA
 MACRO GC_DLL
-MACRO GC_BUILD
 MACRO SYMBIAN
 //MACRO ENABLE_DISCLAIM
 //MACRO GC_GCJ_SUPPORT

diff --git a/digimars.mak b/digimars.mak
index 383df5c434c9042017870367854ffa7e9e8bcfca..7c75eb42de32632d9d48a6200da86dc83738a90a 100644 (file)
--- a/digimars.mak
+++ b/digimars.mak
@@ -3,7 +3,7 @@
 # Written by Walter Bright\r
 \r
 \r
-DEFINES=-DNDEBUG -DGC_BUILD -D_WINDOWS -DGC_DLL -DALL_INTERIOR_POINTERS -DWIN32_THREADS\r
+DEFINES=-DNDEBUG -D_WINDOWS -DGC_DLL -DALL_INTERIOR_POINTERS -DWIN32_THREADS\r
 CFLAGS=-Iinclude $(DEFINES) -wx -g\r
 LFLAGS=/ma/implib/co\r
 CC=sc\r
@@ -62,7 +62,7 @@ gctest.exe : gc.lib tests\test.obj
        sc -ogctest.exe tests\test.obj gc.lib\r
 \r
 tests\test.obj : tests\test.c\r
-       $(CC) -c -g -DNDEBUG -DGC_BUILD -D_WINDOWS -DGC_DLL \\r
+       $(CC) -c -g -DNDEBUG -D_WINDOWS -DGC_DLL \\r
        -DALL_INTERIOR_POINTERS -DWIN32_THREADS \\r
        -Iinclude tests\test.c -otests\test.obj\r
 \r

diff --git a/extra/MacOS.c b/extra/MacOS.c
index 6cb5edb7f063f23783df68b480284c63869132ed..6403613149c5f551a2ce616202fad0a7560d26af 100644 (file)
--- a/extra/MacOS.c
+++ b/extra/MacOS.c
@@ -22,6 +22,7 @@ unloading shared library.
 #include <stdlib.h>
 #include <string.h>
 
+#define GC_BUILD
 #include "gc.h"
 #include "gc_priv.h"
 

diff --git a/extra/msvc_dbg.c b/extra/msvc_dbg.c
index 7884ecdd9a8bd701e4ed56466afe72bbe6818b5b..ea7fc7b6c3cf418a54abfae716aa839e7a03cdb7 100644 (file)
--- a/extra/msvc_dbg.c
+++ b/extra/msvc_dbg.c
@@ -24,8 +24,8 @@
 
 /* X86_64 is currently missing some meachine-dependent code below.  */
 
+#define GC_BUILD
 #include "private/msvc_dbg.h"
-
 #include "gc.h"
 
 #define WIN32_LEAN_AND_MEAN

diff --git a/windows-untested/vc60/gc.dsp b/windows-untested/vc60/gc.dsp
index b3169eb7dcf51fe4412fc04f0f5cc030b3d7f0ad..762a22203acd693a7fdd514ae33d4c225868c0d4 100644 (file)
--- a/windows-untested/vc60/gc.dsp
+++ b/windows-untested/vc60/gc.dsp
@@ -7,19 +7,19 @@
 CFG=gc - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "gc.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "gc.mak" CFG="gc - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "gc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "gc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\include" /FI"stdafx.h" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "GC_BUILD" /D "GC_DLL" /D "WIN32" /D "_MBCS" /D "GC_THREADS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\include" /FI"stdafx.h" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "GC_DLL" /D "WIN32" /D "_MBCS" /D "GC_THREADS" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -75,7 +75,7 @@ PostBuild_Cmds=del $(OutDir)\..\lib\gc.exp
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /FI"stdafx.h" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "GC_BUILD" /D "GC_DLL" /D "WIN32" /D "_MBCS" /D "GC_THREADS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /FI"stdafx.h" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "GC_DLL" /D "WIN32" /D "_MBCS" /D "GC_THREADS" /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@ SOURCE="$(InputPath)"
 PostBuild_Cmds=del $(OutDir)\..\lib\gcd.exp
 # End Special Build Tool
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 

diff --git a/windows-untested/vc60/libgc.dsp b/windows-untested/vc60/libgc.dsp
index 40cb4d65619620509a2e2ed0a4c39e09ba4a66d9..f7d77df53f22aa14c264632a41869e66fee1f0db 100644 (file)
--- a/windows-untested/vc60/libgc.dsp
+++ b/windows-untested/vc60/libgc.dsp
@@ -7,19 +7,19 @@
 CFG=libgc - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "libgc.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "libgc.mak" CFG="libgc - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "libgc - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "libgc - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "..\..\..\obj\Release\libgc"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Zi /O2 /I "..\..\include" /FI"stdafx.h" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "GC_BUILD" /Yu"stdafx.h" /Fd"..\..\..\lib\libgc.pdb" /FD /c
+# ADD CPP /nologo /W3 /GX /Zi /O2 /I "..\..\include" /FI"stdafx.h" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /Yu"stdafx.h" /Fd"..\..\..\lib\libgc.pdb" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -70,7 +70,7 @@ PostBuild_Cmds=del $(OutDir)\$(TargetName).idb
 # PROP Intermediate_Dir "..\..\..\obj\Debug\libgc"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /GX /Zi /Od /I "..\..\include" /FI"stdafx.h" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "GC_BUILD" /Yu"stdafx.h" /Fd"..\..\..\lib\libgcd.pdb" /FD /GZ /c
+# ADD CPP /nologo /W3 /GX /Zi /Od /I "..\..\include" /FI"stdafx.h" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /Yu"stdafx.h" /Fd"..\..\..\lib\libgcd.pdb" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -86,7 +86,7 @@ SOURCE="$(InputPath)"
 PostBuild_Cmds=del $(OutDir)\$(TargetName).idb
 # End Special Build Tool
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 

diff --git a/windows-untested/vc60/libgcmt.dsp b/windows-untested/vc60/libgcmt.dsp
index 14b6fbe2007025f71bb53d3deb6e6bfdcf4c67ce..72d3658c2997c9cca73a380e2cbf47c910953b13 100644 (file)
--- a/windows-untested/vc60/libgcmt.dsp
+++ b/windows-untested/vc60/libgcmt.dsp
@@ -7,19 +7,19 @@
 CFG=libgcmt - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "libgcmt.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "libgcmt.mak" CFG="libgcmt - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "libgcmt - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "libgcmt - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "..\..\..\obj\Release\libgcmt"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\..\include" /FI"stdafx.h" /D "NDEBUG" /D "_LIB" /D "GC_BUILD" /D "WIN32" /D "_MBCS" /D "GC_THREADS" /Yu"stdafx.h" /Fd"..\..\..\lib\libgcmt.pdb" /Zl /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\..\include" /FI"stdafx.h" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "GC_THREADS" /Yu"stdafx.h" /Fd"..\..\..\lib\libgcmt.pdb" /Zl /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -70,7 +70,7 @@ PostBuild_Cmds=del $(OutDir)\$(TargetName).idb
 # PROP Intermediate_Dir "..\..\..\obj\Debug\libgcmt"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\..\include" /FI"stdafx.h" /D "_DEBUG" /D "_LIB" /D "GC_BUILD" /D "WIN32" /D "_MBCS" /D "GC_THREADS" /Yu"stdafx.h" /Fd"..\..\..\lib\libgcmtd.pdb" /Zl /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\..\include" /FI"stdafx.h" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "GC_THREADS" /Yu"stdafx.h" /Fd"..\..\..\lib\libgcmtd.pdb" /Zl /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -86,7 +86,7 @@ SOURCE="$(InputPath)"
 PostBuild_Cmds=del $(OutDir)\$(TargetName).idb
 # End Special Build Tool
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 

diff --git a/windows-untested/vc70/gc.vcproj b/windows-untested/vc70/gc.vcproj
index c143e76b8337f244aaae73533e376bbbf9b749fa..9f18300e85fd2d31d380c5960bfd9ff2fa3e6475 100644 (file)
--- a/windows-untested/vc70/gc.vcproj
+++ b/windows-untested/vc70/gc.vcproj
@@ -22,7 +22,7 @@
                 Name="VCCLCompilerTool"
                 InlineFunctionExpansion="1"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;GC_THREADS"
+                PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;GC_THREADS"
                 StringPooling="TRUE"
                 RuntimeLibrary="2"
                 EnableFunctionLevelLinking="TRUE"
@@ -89,7 +89,7 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;GC_THREADS"
+                PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;GC_THREADS"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="3"
                 UsePrecompiledHeader="3"

diff --git a/windows-untested/vc70/libgc.vcproj b/windows-untested/vc70/libgc.vcproj
index 10deed7c3036e1d9cbcc5195a05fbcaf5867a2d5..56847eb987054f59a7d7ffde60e74f7666455a2d 100644 (file)
--- a/windows-untested/vc70/libgc.vcproj
+++ b/windows-untested/vc70/libgc.vcproj
@@ -22,7 +22,7 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="_DEBUG,_LIB,WIN32,GC_BUILD"
+                PreprocessorDefinitions="_DEBUG,_LIB,WIN32"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="5"
                 UsePrecompiledHeader="3"
@@ -70,7 +70,7 @@
                 Name="VCCLCompilerTool"
                 InlineFunctionExpansion="1"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="NDEBUG,_LIB,WIN32,GC_BUILD"
+                PreprocessorDefinitions="NDEBUG,_LIB,WIN32"
                 StringPooling="TRUE"
                 RuntimeLibrary="4"
                 EnableFunctionLevelLinking="TRUE"

diff --git a/windows-untested/vc70/libgcmt.vcproj b/windows-untested/vc70/libgcmt.vcproj
index 446180de87019867b99607150bce1fb1c8186388..ab57400765518c82f4cba292bb663b104e1c1b8c 100644 (file)
--- a/windows-untested/vc70/libgcmt.vcproj
+++ b/windows-untested/vc70/libgcmt.vcproj
@@ -22,7 +22,7 @@
                 Name="VCCLCompilerTool"
                 InlineFunctionExpansion="1"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="NDEBUG,_LIB,GC_BUILD,WIN32,GC_THREADS"
+                PreprocessorDefinitions="NDEBUG,_LIB,WIN32,GC_THREADS"
                 StringPooling="TRUE"
                 RuntimeLibrary="0"
                 EnableFunctionLevelLinking="TRUE"
@@ -71,7 +71,7 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="_DEBUG,_LIB,GC_BUILD,WIN32,GC_THREADS"
+                PreprocessorDefinitions="_DEBUG,_LIB,WIN32,GC_THREADS"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="1"
                 UsePrecompiledHeader="3"

diff --git a/windows-untested/vc71/gc.vcproj b/windows-untested/vc71/gc.vcproj
index d33e9a3a0b08233ba2f141b02f3a05ca740209ac..af5598f8fbfb16507219adfcabba03cf0ee678c2 100644 (file)
--- a/windows-untested/vc71/gc.vcproj
+++ b/windows-untested/vc71/gc.vcproj
@@ -23,7 +23,7 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;GC_THREADS"
+                PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;GC_THREADS"
                 StringPooling="TRUE"
                 RuntimeLibrary="2"
                 EnableFunctionLevelLinking="TRUE"
@@ -97,7 +97,7 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;GC_THREADS"
+                PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;GC_THREADS"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="3"
                 UsePrecompiledHeader="3"
@@ -171,7 +171,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -180,7 +180,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -193,7 +193,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -202,7 +202,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -215,7 +215,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -224,7 +224,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -237,7 +237,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -246,7 +246,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -259,7 +259,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -268,7 +268,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -281,7 +281,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -290,7 +290,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -303,7 +303,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -312,7 +312,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -325,7 +325,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -334,7 +334,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -347,7 +347,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -356,7 +356,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -369,7 +369,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -378,7 +378,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -391,7 +391,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -400,7 +400,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -413,7 +413,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -422,7 +422,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -435,7 +435,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -444,7 +444,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -457,7 +457,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -466,7 +466,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -479,7 +479,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -488,7 +488,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -501,7 +501,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -510,7 +510,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -523,7 +523,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -532,7 +532,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -545,7 +545,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -554,7 +554,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -567,7 +567,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -576,7 +576,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -589,7 +589,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -598,7 +598,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -611,7 +611,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -620,7 +620,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -633,7 +633,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -642,7 +642,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -655,7 +655,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -664,7 +664,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -677,7 +677,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         UsePrecompiledHeader="1"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -687,7 +687,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         UsePrecompiledHeader="1"
                         ForcedIncludeFiles=""/>
@@ -701,7 +701,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -710,7 +710,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -723,7 +723,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -732,7 +732,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
@@ -745,7 +745,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="2"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>
                 <FileConfiguration
@@ -754,7 +754,7 @@
                         Name="VCCLCompilerTool"
                         Optimization="0"
                         AdditionalIncludeDirectories=""
-                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
                         BasicRuntimeChecks="3"
                         ForcedIncludeFiles=""/>
                 </FileConfiguration>

diff --git a/windows-untested/vc71/libgc.vcproj b/windows-untested/vc71/libgc.vcproj
index 6c5bfdce44ac4e96bfbf381f56f19db8d556e8e6..f0cc90861a27b008b38dba8214eafa4c2c45da66 100644 (file)
--- a/windows-untested/vc71/libgc.vcproj
+++ b/windows-untested/vc71/libgc.vcproj
@@ -23,7 +23,7 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="NDEBUG;_LIB;WIN32;GC_BUILD"
+                PreprocessorDefinitions="NDEBUG;_LIB;WIN32"
                 StringPooling="TRUE"
                 RuntimeLibrary="4"
                 EnableFunctionLevelLinking="TRUE"
@@ -78,7 +78,7 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="_DEBUG;_LIB;WIN32;GC_BUILD"
+                PreprocessorDefinitions="_DEBUG;_LIB;WIN32"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="5"
                 UsePrecompiledHeader="3"

diff --git a/windows-untested/vc71/libgcmt.vcproj b/windows-untested/vc71/libgcmt.vcproj
index 96c526becb2de87acc2e2bfa15a06fec2db73541..1005eb9762229bf41e00e13b02cef85a84bbdf64 100644 (file)
--- a/windows-untested/vc71/libgcmt.vcproj
+++ b/windows-untested/vc71/libgcmt.vcproj
@@ -22,7 +22,7 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="_DEBUG;_LIB;GC_BUILD;WIN32;GC_THREADS"
+                PreprocessorDefinitions="_DEBUG;_LIB;WIN32;GC_THREADS"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="1"
                 UsePrecompiledHeader="3"
@@ -77,7 +77,7 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
                 AdditionalIncludeDirectories="..\..\include"
-                PreprocessorDefinitions="NDEBUG;_LIB;GC_BUILD;WIN32;GC_THREADS"
+                PreprocessorDefinitions="NDEBUG;_LIB;WIN32;GC_THREADS"
                 StringPooling="TRUE"
                 RuntimeLibrary="0"
                 EnableFunctionLevelLinking="TRUE"