From af985d2adc340508a6a09405456aa38fa2aa2600 Mon Sep 17 00:00:00 2001 From: ivmai Date: Fri, 15 Jan 2010 07:23:05 +0000 Subject: [PATCH] 2010-01-15 Ivan Maidanski * include/gc_cpp.h (GC_PLACEMENT_DELETE): Define for Embarcadero (formerly known as Borland) C++ compiler v6.21+. * include/gc_cpp.h (GC_NO_OPERATOR_NEW_ARRAY): Define for ancient VC++ compilers. --- ChangeLog | 7 +++++++ include/gc_cpp.h | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2748a3ed8..f4cad32b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-15 Ivan Maidanski + + * include/gc_cpp.h (GC_PLACEMENT_DELETE): Define for Embarcadero + (formerly known as Borland) C++ compiler v6.21+. + * include/gc_cpp.h (GC_NO_OPERATOR_NEW_ARRAY): Define for ancient + VC++ compilers. + 2009-12-18 Ivan Maidanski * win32_threads.c (GC_register_my_thread_inner, diff --git a/include/gc_cpp.h b/include/gc_cpp.h index a1eabe3df..ff77a1fdc 100644 --- a/include/gc_cpp.h +++ b/include/gc_cpp.h @@ -153,6 +153,7 @@ by UseGC. GC is an alias for UseGC, unless GC_NAME_CONFLICT is defined. && (defined(__BORLANDC__) && (__BORLANDC__ < 0x450) \ || (defined(__GNUC__) && \ (__GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 6)) \ + || (defined(_MSC_VER) && _MSC_VER <= 1020) \ || (defined(__WATCOMC__) && __WATCOMC__ < 1050)) # define GC_NO_OPERATOR_NEW_ARRAY #endif @@ -161,7 +162,7 @@ by UseGC. GC is an alias for UseGC, unless GC_NAME_CONFLICT is defined. # define GC_OPERATOR_NEW_ARRAY #endif -#if ! defined ( __BORLANDC__ ) /* Confuses the Borland compiler. */ \ +#if (!defined(__BORLANDC__) || __BORLANDC__ > 0x0620) \ && ! defined ( __sgi ) && ! defined( __WATCOMC__ ) \ && (!defined(_MSC_VER) || _MSC_VER > 1020) # define GC_PLACEMENT_DELETE