From: sof Date: Thu, 14 Feb 2002 17:21:50 +0000 (+0000) Subject: [project @ 2002-02-14 17:21:50 by sof] X-Git-Tag: Approximately_9120_patches~42 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4acbbe8a286a8c040c335aec7518bb142fd22505;p=ghc-hetmet.git [project @ 2002-02-14 17:21:50 by sof] widen the scope of is_heap_alloced() proto; for all mingw builds --- diff --git a/ghc/rts/MBlock.h b/ghc/rts/MBlock.h index a35b563..4fac867 100644 --- a/ghc/rts/MBlock.h +++ b/ghc/rts/MBlock.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: MBlock.h,v 1.12 2002/01/21 17:18:43 sof Exp $ + * $Id: MBlock.h,v 1.13 2002/02/14 17:21:50 sof Exp $ * * (c) The GHC Team, 1998-1999 * @@ -10,7 +10,7 @@ #define __MBLOCK_H__ extern lnat mblocks_allocated; -#ifdef ENABLE_WIN32_DLL_SUPPORT +#if defined(mingw32_TARGET_OS) extern int is_heap_alloced(const void* p); #endif diff --git a/ghc/rts/Storage.h b/ghc/rts/Storage.h index 1642749..b6c3731 100644 --- a/ghc/rts/Storage.h +++ b/ghc/rts/Storage.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Storage.h,v 1.40 2002/02/04 20:21:16 sof Exp $ + * $Id: Storage.h,v 1.41 2002/02/14 17:21:50 sof Exp $ * * (c) The GHC Team, 1998-1999 * @@ -435,7 +435,7 @@ extern void* DATA_SECTION_END_MARKER_DECL; #ifdef TEXT_BEFORE_HEAP # define HEAP_ALLOCED(x) ((StgPtr)(x) >= (StgPtr)(HEAP_BASE)) #else -extern int is_heap_alloced(const void* x); +/* mingw, really */ # define HEAP_ALLOCED(x) (is_heap_alloced(x)) #endif