diff mercurial/util.h @ 24895:7e67ddd08a2e

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 01 May 2015 17:21:10 -0500
parents 8e9f8d2a2c0c
children 80d28a88137f
line wrap: on
line diff
--- a/mercurial/util.h	Thu Apr 16 20:56:43 2015 -0500
+++ b/mercurial/util.h	Fri May 01 17:21:10 2015 -0500
@@ -218,7 +218,7 @@
 
 #define MIN(a, b) (((a)<(b))?(a):(b))
 /* VC9 doesn't include bool and lacks stdbool.h based on my searching */
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || __STDC_VERSION__ < 199901L
 #define true 1
 #define false 0
 typedef unsigned char bool;