stricter error checking in rawhide's gcc, perhaps?

diff --git a/contrib/diffimg/diffimg.c b/contrib/diffimg/diffimg.c
index f1a319d949546aa84f56633dd53c7d2296a598e2..23518b821e9c12890a786f4b1e011c5b83de772f 100644 (file)
--- a/contrib/diffimg/diffimg.c
+++ b/contrib/diffimg/diffimg.c
@@ -61,8 +61,10 @@
 #endif
 
 #define NOT(v) (!(v))
-#if ! defined HAVE_BOOL && ! defined __cplusplus
+#if ! defined HAVE_BOOL && ! defined HAVE_STDBOOL_H && ! defined __cplusplus
 typedef unsigned char bool;
+#endif
+#ifndef false
 #define false 0
 #define true NOT(false)
 #endif