[project @ 2000-08-17 15:19:17 by rrt]

Changed HAVE_WIN32_DLL_SUPPORT to ENABLE_WIN32_DLL_SUPPORT so that the
relevant bits are only used in the dynamic Windows build (as they should be).

diff --git a/ghc/includes/ClosureMacros.h b/ghc/includes/ClosureMacros.h
index 2033348..2e9d024 100644 (file)
--- a/ghc/includes/ClosureMacros.h
+++ b/ghc/includes/ClosureMacros.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: ClosureMacros.h,v 1.24 2000/08/16 15:29:34 rrt Exp $
+ * $Id: ClosureMacros.h,v 1.25 2000/08/17 15:19:17 rrt Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -116,7 +116,7 @@ extern void* DATA_SECTION_END_MARKER_DECL;
 #endif
 
 
-#ifdef HAVE_WIN32_DLL_SUPPORT /* needed for mingw DietHEP */
+#ifdef ENABLE_WIN32_DLL_SUPPORT /* needed for mingw DietHEP */
    extern int is_heap_alloced(const void* x);
 #  define HEAP_ALLOCED(x)  (is_heap_alloced(x))
 #else
@@ -137,8 +137,8 @@ extern void* DATA_SECTION_END_MARKER_DECL;
    LOOKS_LIKE_STATIC() 
        - distinguishes between static and heap allocated data.
  */
-#if defined(HAVE_WIN32_DLL_SUPPORT) && !defined(INTERPRETER)
-                                       /* definitely do not enable for mingw DietHEP */
+#if defined(ENABLE_WIN32_DLL_SUPPORT) && !defined(INTERPRETER)
+            /* definitely do not enable for mingw DietHEP */
 #define LOOKS_LIKE_STATIC(r) (!(HEAP_ALLOCED(r)))
 
 /* Tiresome predicates needed to check for pointers into the closure tables */

diff --git a/ghc/includes/InfoMacros.h b/ghc/includes/InfoMacros.h
index 7e64899..0295cfb 100644 (file)
--- a/ghc/includes/InfoMacros.h
+++ b/ghc/includes/InfoMacros.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: InfoMacros.h,v 1.12 2000/05/26 10:14:33 sewardj Exp $
+ * $Id: InfoMacros.h,v 1.13 2000/08/17 15:19:17 rrt Exp $
  * 
  * (c) The GHC Team, 1998-1999
  *
@@ -609,7 +609,7 @@ typedef vec_info_8 StgPolyInfoTable;
    to distinguish these kinds of references.
    (ToDo: fill in a more precise href.)
 */
-#ifdef HAVE_WIN32_DLL_SUPPORT /* mingw DietHEP doesn't seem to care either way */
+#ifdef ENABLE_WIN32_DLL_SUPPORT /* mingw DietHEP doesn't seem to care either way */
 #define DLL_SRT_ENTRY(x) ((StgClosure*)(((char*)&DLL_IMPORT_DATA_VAR(x)) + 1))
 #else
 #define DLL_SRT_ENTRY(x) no-can-do