# HG changeset patch
# User Andrew Innes <andrewi@gnu.org>
# Date 966987060 0
# Node ID 14beb147ec06b7b9c5326bf62e2cc33db2a2950c
# Parent  9feda85db5d68c84570cc769737109080b3670d5
[!USE_CRT_DLL]: Don't define _heap_init and _heap_term
unless we are linking with a static CRT.
(RVA_TO_PTR): Cast result to unsigned char*.

diff -r 9feda85db5d6 -r 14beb147ec06 src/w32heap.c
--- a/src/w32heap.c	Tue Aug 22 23:00:51 2000 +0000
+++ b/src/w32heap.c	Tue Aug 22 23:31:00 2000 +0000
@@ -30,7 +30,7 @@
 #include "lisp.h"  /* for VALMASK */
 
 #undef RVA_TO_PTR
-#define RVA_TO_PTR(rva) ((DWORD)(rva) + (DWORD)GetModuleHandle (NULL))
+#define RVA_TO_PTR(rva) ((unsigned char *)((DWORD)(rva) + (DWORD)GetModuleHandle (NULL)))
 
 /* This gives us the page size and the size of the allocation unit on NT.  */
 SYSTEM_INFO sysinfo_cache;
@@ -275,7 +275,7 @@
     sbrk (need_to_alloc);
 }
 
-#if (_MSC_VER >= 1000)
+#if (_MSC_VER >= 1000 && !defined(USE_CRT_DLL))
 
 /* MSVC 4.2 invokes these functions from mainCRTStartup to initialize
    a heap via HeapCreate.  They are normally defined by the runtime,