From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 30 Jan 2003 20:55:52 +0000 (+0000)
Subject: Apply this change from HEAD:
X-Git-Tag: emacs-21.3~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d1311394f7bb219e3a7134c9e584b86e1f9d51f;p=emacs.git

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 1e350553865..c02f3626878 100644
--- 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 eb878a45e94..a1df7eb02a4 100644
--- 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,