Mercurial > hg > xemacs-beta

diff lwlib/lwlib.c @ 2:ac2d302a0011 r19-15b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children bcdc7deadc19
line wrap: on
line diff
--- a/lwlib/lwlib.c	Mon Aug 13 08:45:53 2007 +0200
+++ b/lwlib/lwlib.c	Mon Aug 13 08:46:35 2007 +0200
@@ -35,7 +35,7 @@
 #define alloca __builtin_alloca
 #endif
 
-#if ((!__GNUC__) && !defined(__hpux)) && !defined(_AIX) && !defined (_SCO_DS) && !defined (__USLC__)
+#if ((!__GNUC__) && !defined(__hpux)) && !defined(_AIX) && !defined (_SCO_DS) && !defined (__USLC__) && !defined(sinix)
 #include <alloca.h>
 #endif
 
@@ -475,10 +475,10 @@
   return (s1 && s2) ? strcmp (s1, s2) : s1 ? False : !!s2;
 }
 
-static int
-max (int i1, int i2)
+static change_type
+max (change_type i1, change_type i2)
 {
-  return i1 > i2 ? i1 : i2;
+  return (int)i1 > (int)i2 ? i1 : i2;
 }