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.

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)

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)

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

digimars.mak

@@ -3,7 +3,7 @@
 # Written by Walter Bright
 
 
-DEFINES=-DNDEBUG -DGC_BUILD -D_WINDOWS -DGC_DLL -DALL_INTERIOR_POINTERS -DWIN32_THREADS
+DEFINES=-DNDEBUG -D_WINDOWS -DGC_DLL -DALL_INTERIOR_POINTERS -DWIN32_THREADS
 CFLAGS=-Iinclude $(DEFINES) -wx -g
 LFLAGS=/ma/implib/co
 CC=sc
@@ -62,7 +62,7 @@ gctest.exe : gc.lib tests\test.obj
 	sc -ogctest.exe tests\test.obj gc.lib
 
 tests\test.obj : tests\test.c
-	$(CC) -c -g -DNDEBUG -DGC_BUILD -D_WINDOWS -DGC_DLL \
+	$(CC) -c -g -DNDEBUG -D_WINDOWS -DGC_DLL \
 	-DALL_INTERIOR_POINTERS -DWIN32_THREADS \
 	-Iinclude tests\test.c -otests\test.obj
 

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"
 

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

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"

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"

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"