From f6bbc2a7e379dc1a98c66593c4add6d65a7e1d5b Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 13 Sep 2011 12:09:05 +0400 Subject: HOTFIX: Fix gc_cpp.cc for Cygwin (remove duplicate function definition). * gc_cpp.cc (operator delete): Do not define for Cygwin since already defined in include/gc_cpp.h file. --- gc_cpp.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gc_cpp.cc') diff --git a/gc_cpp.cc b/gc_cpp.cc index 326a923a..eaf70fb1 100644 --- a/gc_cpp.cc +++ b/gc_cpp.cc @@ -32,8 +32,11 @@ built-in "new" and "delete". void* operator new( size_t size ) { return GC_MALLOC_UNCOLLECTABLE( size );} -void operator delete( void* obj ) { - GC_FREE( obj );} +#if !defined(__CYGWIN__) + void operator delete( void* obj ) { + GC_FREE( obj ); + } +#endif /* !__CYGWIN__ */ #ifdef GC_OPERATOR_NEW_ARRAY -- cgit v1.2.1