X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fntheap.c;h=0f31ff5e79d6558688d5105023bca2bdd840beba;hb=3a82ca503a2678b75aacb3b4d3ef66897f7fd03c;hp=669520305902bcda509a9dcfd0e7a4058aaa5780;hpb=76759ab036458c54499a454399e19602b8ae6ce3;p=chise%2Fxemacs-chise.git.1 diff --git a/src/ntheap.c b/src/ntheap.c index 6695203..0f31ff5 100644 --- a/src/ntheap.c +++ b/src/ntheap.c @@ -291,13 +291,15 @@ round_heap (unsigned long align) sbrk (need_to_alloc); } -#if (_MSC_VER >= 1000) +#if ((_MSC_VER >= 1000) && (_MSC_VER < 1300)) /* MSVC 4.2 invokes these functions from mainCRTStartup to initialize a heap via HeapCreate. They are normally defined by the runtime, but we override them here so that the unnecessary HeapCreate call is not performed. */ +/* MSVC 7.0 does not allow you to redefine _heap_init or _heap_term. */ + int __cdecl _heap_init (void) {