Mercurial > hg > xemacs-beta

diff lwlib/lwlib.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 1ce6082ce73f
children b980b6286996
line wrap: on
line diff
--- a/lwlib/lwlib.c	Mon Aug 13 09:23:08 2007 +0200
+++ b/lwlib/lwlib.c	Mon Aug 13 09:24:17 2007 +0200
@@ -36,10 +36,16 @@
 #define alloca __builtin_alloca
 #endif
 
-#if ((!__GNUC__) && !defined(__hpux)) && !defined(_AIX) && !defined (_SCO_DS) && !defined (__USLC__) && !defined(sinix)
+#if ((!__GNUC__) && !defined(__hpux)) && !defined(_AIX) && !defined (_SCO_DS) && !defined (__USLC__) && !defined(sinix) && !defined(WINDOWSNT)
 #include <alloca.h>
 #endif
 
+#ifdef WINDOWSNT
+/* NT has an _alloca function prototyped in malloc.h --marcpa */
+#include <malloc.h>
+#endif
+
+
 #ifdef __SUNPRO_C
 void *__builtin_alloca (unsigned int);
 #endif
@@ -476,11 +482,13 @@
   return (s1 && s2) ? strcmp (s1, s2) : s1 ? False : !!s2;
 }
 
+#ifndef WINDOWSNT
 static change_type
 max (change_type i1, change_type i2)
 {
   return (int)i1 > (int)i2 ? i1 : i2;
 }
+#endif
 
 
 #if 0