Use <malloc.h> also with Digital Mars compiler on Win32. (#346808, Serhat

2007-01-17  Tor Lillqvist  <tml@novell.com>

	* glib/galloca.h: Use <malloc.h> also with Digital Mars compiler
	on Win32. (#346808, Serhat Sevki Dincer)

svn path=/trunk/; revision=5285

diff --git a/ChangeLog b/ChangeLog
index baab6605498a25264b8285dd659d86239d467146..0f8ee5900cf6ae185f72f27ea3153603b1a6424f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Tor Lillqvist  <tml@novell.com>
+
+       * glib/galloca.h: Use <malloc.h> also with Digital Mars compiler
+       on Win32. (#346808, Serhat Sevki Dincer)
+
 2007-01-16  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gthread.h:

diff --git a/glib/galloca.h b/glib/galloca.h
index 110beb53e36a9b0d494281fbd7647d3d73f6fe8f..7c59ea45d7ade86fa150a8ff4a1a67481353ded8 100644 (file)
--- a/glib/galloca.h
+++ b/glib/galloca.h
@@ -37,7 +37,7 @@
 /* a native and working alloca.h is there */ 
 # include <alloca.h>
 #else /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-# ifdef _MSC_VER
+# if defined(_MSC_VER) || defined(__DMC__)
 #  include <malloc.h>
 #  define alloca _alloca
 # else /* !_MSC_VER */