From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 31 Oct 2010 16:07:40 +0000 (+0100)
Subject: src/collectd.h: Do not include <stdbool.h> here.
X-Git-Tag: collectd-5.0.0-beta0~30
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=65dba471769a4e69bc505c758015ffdfb76a6053;p=collectd.git

src/collectd.h: Do not include <stdbool.h> here.
---

diff --git a/src/collectd.h b/src/collectd.h
index 8849b30b..6faa1a4e 100644
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -56,21 +56,6 @@
 #if HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# ifndef HAVE__BOOL
-#  ifdef __cplusplus
-typedef bool _Bool;
-#  else
-#   define _Bool signed char
-#  endif
-# endif
-# define bool _Bool
-# define false 0
-# define true 1
-# define __bool_true_false_are_defined 1
-#endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
diff --git a/src/df.c b/src/df.c
index b2be8e5e..4b3cba01 100644
--- a/src/df.c
+++ b/src/df.c
@@ -60,8 +60,8 @@ static ignorelist_t *il_device = NULL;
 static ignorelist_t *il_mountpoint = NULL;
 static ignorelist_t *il_fstype = NULL;
 
-static _Bool by_device = false;
-static _Bool report_inodes = false;
+static _Bool by_device = 0;
+static _Bool report_inodes = 0;
 
 static int df_init (void)
 {
@@ -116,16 +116,16 @@ static int df_config (const char *key, const char *value)
 	else if (strcasecmp (key, "ReportByDevice") == 0)
 	{
 		if (IS_TRUE (value))
-			by_device = true;
+			by_device = 1;
 
 		return (0);
 	}
 	else if (strcasecmp (key, "ReportInodes") == 0)
 	{
 		if (IS_TRUE (value))
-			report_inodes = true;
+			report_inodes = 1;
 		else
-			report_inodes = false;
+			report_inodes = 0;
 
 		return (0);
 	}
diff --git a/src/perl.c b/src/perl.c
index afb3ba7e..72605804 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -33,6 +33,10 @@
 
 #include "configfile.h"
 
+#if HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif
+
 #include <EXTERN.h>
 #include <perl.h>
 
diff --git a/src/plugin.c b/src/plugin.c
index af894d54..65d3875e 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1654,7 +1654,7 @@ static int plugin_notification_meta_add (notification_t *n,
     }
     case NM_TYPE_BOOLEAN:
     {
-      meta->nm_value.nm_boolean = *((bool *) value);
+      meta->nm_value.nm_boolean = *((_Bool *) value);
       break;
     }
     default:
@@ -1708,7 +1708,7 @@ int plugin_notification_meta_add_double (notification_t *n,
 
 int plugin_notification_meta_add_boolean (notification_t *n,
     const char *name,
-    bool value)
+    _Bool value)
 {
   return (plugin_notification_meta_add (n, name, NM_TYPE_BOOLEAN, &value));
 }
diff --git a/src/plugin.h b/src/plugin.h
index 8b9449ee..d78aa4f8 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -135,7 +135,7 @@ typedef struct notification_meta_s
 		int64_t nm_signed_int;
 		uint64_t nm_unsigned_int;
 		double nm_double;
-		bool nm_boolean;
+		_Bool nm_boolean;
 	} nm_value;
 	struct notification_meta_s *next;
 } notification_meta_t;
@@ -340,7 +340,7 @@ int plugin_notification_meta_add_double (notification_t *n,
     double value);
 int plugin_notification_meta_add_boolean (notification_t *n,
     const char *name,
-    bool value);
+    _Bool value);
 
 int plugin_notification_meta_copy (notification_t *dst,
     const notification_t *src);
diff --git a/src/rrdtool.c b/src/rrdtool.c
index 4655b96e..cb8ad593 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -303,7 +303,7 @@ static void *rrd_queue_thread (void __attribute__((unused)) *data)
 
                 pthread_mutex_lock (&queue_lock);
                 /* Wait for values to arrive */
-                while (true)
+                while (42)
                 {
                   struct timespec ts_wait;
 
@@ -342,7 +342,7 @@ static void *rrd_queue_thread (void __attribute__((unused)) *data)
                       &ts_wait);
                   if (status == ETIMEDOUT)
                     break;
-                } /* while (true) */
+                } /* while (42) */
 
                 /* XXX: If you need to lock both, cache_lock and queue_lock, at
                  * the same time, ALWAYS lock `cache_lock' first! */