Apply this change from HEAD:

2002-10-28  Harald Maier  <Harald.Maier.BW@t-online.de>  (tiny change)

	* w32heap.c: Don't redefine _heap_init and _heap_term on MSVC 7 build
	environments.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1e35055386528657a744f2acf29c322669ab2a99..c02f362687885e4e5bab3834744e50a42360105f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-30  Harald Maier  <Harald.Maier.BW@t-online.de>  (tiny change)
+
+       * w32heap.c: Don't redefine _heap_init and _heap_term on MSVC 7 build
+       environments.
+
 2003-01-24  Andreas Schwab  <schwab@suse.de>
 
        * minibuf.c (Fminibuffer_message): Verify type of parameter.

diff --git a/src/w32heap.c b/src/w32heap.c
index eb878a45e94885e57c768bb2942feef426622166..a1df7eb02a4e579d65aec61aba5515999cec43d1 100644 (file)
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -280,7 +280,7 @@ round_heap (unsigned long align)
     sbrk (need_to_alloc);
 }
 
-#if (_MSC_VER >= 1000 && !defined(USE_CRT_DLL))
+#if (_MSC_VER >= 1000 && _MSC_VER < 1300 && !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,