aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFabrice Popineau2012-03-25 20:30:50 +0200
committerEli Zaretskii2012-03-25 20:30:50 +0200
commitf514f6f0e3f8bbeb5212d0337e5bda5a9a4eaeb5 (patch)
tree9614773ed296cf75b4cea423f68d44f051ab2e32 /src
parente5a69fd00a424f59f2ef7be8049b47340ddaa1ca (diff)
downloademacs-f514f6f0e3f8bbeb5212d0337e5bda5a9a4eaeb5.tar.gz
emacs-f514f6f0e3f8bbeb5212d0337e5bda5a9a4eaeb5.zip
Remove dead MSVC-specific code.
src/w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific code.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32heap.c24
2 files changed, 5 insertions, 24 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0c2ba981111..71bfec1f061 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-03-25 Fabrice Popineau <fabrice.popineau@supelec.fr>
2
3 * w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific
4 code.
5
12012-03-25 Kenichi Handa <handa@m17n.org> 62012-03-25 Kenichi Handa <handa@m17n.org>
2 7
3 * dispextern.h (struct glyph): Change the bit length of 8 * dispextern.h (struct glyph): Change the bit length of
diff --git a/src/w32heap.c b/src/w32heap.c
index 35ac4cbf31f..da8579896f2 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -296,27 +296,3 @@ round_heap (unsigned long align)
296 if (need_to_alloc) 296 if (need_to_alloc)
297 sbrk (need_to_alloc); 297 sbrk (need_to_alloc);
298} 298}
299
300#if (_MSC_VER >= 1000 && _MSC_VER < 1300 && !defined (USE_CRT_DLL))
301
302/* MSVC 4.2 invokes these functions from mainCRTStartup to initialize
303 a heap via HeapCreate. They are normally defined by the runtime,
304 but we override them here so that the unnecessary HeapCreate call
305 is not performed. */
306
307int __cdecl
308_heap_init (void)
309{
310 /* Stepping through the assembly indicates that mainCRTStartup is
311 expecting a nonzero success return value. */
312 return 1;
313}
314
315void __cdecl
316_heap_term (void)
317{
318 return;
319}
320
321#endif
322