diff options
| author | Jason Rumney <jasonr@gnu.org> | 2003-01-30 20:55:27 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2003-01-30 20:55:27 +0000 |
| commit | 7f5e9383b9dfe7f1c2e6f3369249c3e6877a0a28 (patch) | |
| tree | 4836489cd799b9a0fbde79ecf776ac537d3a10d2 | |
| parent | 016605eb9f99d2633711d5e5d8c372dcda97c524 (diff) | |
| download | emacs-7f5e9383b9dfe7f1c2e6f3369249c3e6877a0a28.tar.gz | |
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.
| -rw-r--r-- | src/w32heap.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |