Mercurial > hg > xemacs-beta

diff src/alloca.c @ 118:7d55a9ba150c r20-1b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b11
author cvs
date Mon, 13 Aug 2007 09:24:17 +0200
parents 376386a54a3c
children 3d6bfa290dbd
line wrap: on
line diff
--- a/src/alloca.c	Mon Aug 13 09:23:08 2007 +0200
+++ b/src/alloca.c	Mon Aug 13 09:24:17 2007 +0200
@@ -86,7 +86,9 @@
 # endif
 #endif
 
+#ifndef WINDOWSNT
 #define	NULL	0
+#endif
 
 /* Different portions of Emacs need to call different versions of
    malloc.  The Emacs executable needs alloca to call xmalloc, because
@@ -101,7 +103,11 @@
 #ifndef emacs
 #define malloc xmalloc
 #endif
+#ifndef WINDOWSNT
 extern pointer malloc ();
+#else
+extern void *malloc();
+#endif
 
 /* Define STACK_DIRECTION if you know the direction of stack
    growth for your system; otherwise it will be automatically