bugfix #623: Do not redefine bool type and values

Thanks Jakob Petsovits

diff --git a/Changelog b/Changelog
index 4e350ba2d89dbb7225156408d817dfffefa7e332..2abee86a838fc248bcc5a3218620acb9f0c45802 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -36,6 +36,8 @@ TBD
          Thanks Peter Koch
        * bugfix #697: Double free with ldns-dane create
          Thanks Carsten Strotmann
+       * bugfix #623: Do not redefine bool type and boolean values
+         Thanks Jakob Petsovits
 
 1.6.17 2014-01-10
        * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a

diff --git a/ldns/common.h.in b/ldns/common.h.in
index 8bf9654b4ff5b821665c5def690cf0dbd62f7729..805eb8bf42c7a1c618c5539be27fc2d0133d04ad 100644 (file)
--- a/ldns/common.h.in
+++ b/ldns/common.h.in
@@ -37,20 +37,22 @@
  */
 /*@ignore@*/
 /* splint barfs on this construct */
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# ifndef HAVE__BOOL
-#  ifdef __cplusplus
+#ifndef __bool_true_false_are_defined
+# ifdef HAVE_STDBOOL_H
+#  include <stdbool.h>
+# else
+#  ifndef HAVE__BOOL
+#   ifdef __cplusplus
 typedef bool _Bool;
-#  else
-#   define _Bool signed char
+#   else
+#    define _Bool signed char
+#   endif
 #  endif
+#  define bool _Bool
+#  define false 0
+#  define true 1
+#  define __bool_true_false_are_defined 1
 # endif
-# define bool _Bool
-# define false 0
-# define true 1
-# define __bool_true_false_are_defined 1
 #endif
 /*@end@*/