From c89182b424bb4184bd7da3f2ab687b542ed7eea3 Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 3 Jun 2016 17:44:58 +0200
Subject: [PATCH] all plugins: remove pthread.h include

plugin.h already includes pthread.h
---
 src/aggregation.c    | 2 --
 src/amqp.c           | 2 --
 src/dns.c            | 1 -
 src/email.c          | 4 ----
 src/exec.c           | 2 --
 src/gmond.c          | 3 ---
 src/ipmi.c           | 2 --
 src/java.c           | 1 -
 src/log_logstash.c   | 1 -
 src/logfile.c        | 2 --
 src/mqtt.c           | 2 --
 src/network.c        | 4 ----
 src/notify_email.c   | 1 -
 src/nut.c            | 1 -
 src/perl.c           | 2 --
 src/pinba.c          | 1 -
 src/ping.c           | 1 -
 src/postgresql.c     | 4 ----
 src/python.c         | 3 ---
 src/redis.c          | 1 -
 src/rrdtool.c        | 4 ----
 src/sigrok.c         | 1 -
 src/snmp.c           | 2 --
 src/statsd.c         | 2 --
 src/threshold.c      | 1 -
 src/unixsock.c       | 3 ---
 src/write_graphite.c | 3 ---
 src/write_http.c     | 4 ----
 src/write_kafka.c    | 1 -
 src/write_log.c      | 3 ---
 src/write_mongodb.c  | 2 --
 src/write_redis.c    | 1 -
 src/write_riemann.c  | 1 -
 src/write_sensu.c    | 1 -
 src/write_tsdb.c     | 1 -
 35 files changed, 70 deletions(-)

diff --git a/src/aggregation.c b/src/aggregation.c
index 3d5f396a..c4c1627a 100644
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -26,8 +26,6 @@
 
 #include "collectd.h"
 
-#include <pthread.h>
-
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/amqp.c b/src/amqp.c
index fc69e936..99dca901 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -33,8 +33,6 @@
 #include "utils_format_json.h"
 #include "utils_format_graphite.h"
 
-#include <pthread.h>
-
 #include <amqp.h>
 #include <amqp_framing.h>
 
diff --git a/src/dns.c b/src/dns.c
index 53fa725e..2c3a9043 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -30,7 +30,6 @@
 #include "configfile.h"
 
 #include "utils_dns.h"
-#include <pthread.h>
 #include <poll.h>
 
 #include <pcap.h>
diff --git a/src/email.c b/src/email.c
index ea4e7850..8a1ac2e8 100644
--- a/src/email.c
+++ b/src/email.c
@@ -46,10 +46,6 @@
 
 #include <stddef.h>
 
-#if HAVE_LIBPTHREAD
-# include <pthread.h>
-#endif
-
 #include <sys/un.h>
 #include <sys/select.h>
 
diff --git a/src/exec.c b/src/exec.c
index 6d5908c0..cdaf79a0 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -38,8 +38,6 @@
 #include <grp.h>
 #include <signal.h>
 
-#include <pthread.h>
-
 #define PL_NORMAL        0x01
 #define PL_NOTIF_ACTION  0x02
 
diff --git a/src/gmond.c b/src/gmond.c
index 67e0406c..53cdcbf5 100644
--- a/src/gmond.c
+++ b/src/gmond.c
@@ -30,9 +30,6 @@
 #include "configfile.h"
 #include "utils_avltree.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
diff --git a/src/ipmi.c b/src/ipmi.c
index 76dd9cbd..c3aa5587 100644
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@ -28,8 +28,6 @@
 #include "plugin.h"
 #include "utils_ignorelist.h"
 
-#include <pthread.h>
-
 #include <OpenIPMI/ipmiif.h>
 #include <OpenIPMI/ipmi_err.h>
 #include <OpenIPMI/ipmi_posix.h>
diff --git a/src/java.c b/src/java.c
index 4187e7c3..01dc1b8a 100644
--- a/src/java.c
+++ b/src/java.c
@@ -26,7 +26,6 @@
 #include "common.h"
 #include "filter_chain.h"
 
-#include <pthread.h>
 #include <jni.h>
 
 #if !defined(JNI_VERSION_1_2)
diff --git a/src/log_logstash.c b/src/log_logstash.c
index 2d5f6203..45aa86d1 100644
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -31,7 +31,6 @@
 #include "plugin.h"
 
 #include <sys/types.h>
-#include <pthread.h>
 #include <yajl/yajl_common.h>
 #include <yajl/yajl_gen.h>
 #if HAVE_YAJL_YAJL_VERSION_H
diff --git a/src/logfile.c b/src/logfile.c
index 11797182..334226ba 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -30,8 +30,6 @@
 #include "common.h"
 #include "plugin.h"
 
-#include <pthread.h>
-
 #define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
 
 #if COLLECT_DEBUG
diff --git a/src/mqtt.c b/src/mqtt.c
index 0b00bab8..dbef915a 100644
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -36,8 +36,6 @@
 #include "utils_cache.h"
 #include "utils_complain.h"
 
-#include <pthread.h>
-
 #include <mosquitto.h>
 
 #define MQTT_MAX_TOPIC_SIZE         1024
diff --git a/src/network.c b/src/network.c
index bf1f2ab6..219f163e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -36,9 +36,6 @@
 
 #include "network.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
@@ -56,7 +53,6 @@
 #endif
 
 #if HAVE_LIBGCRYPT
-# include <pthread.h>
 # if defined __APPLE__
 /* default xcode compiler throws warnings even when deprecated functionality
  * is not used. -Werror breaks the build because of erroneous warnings.
diff --git a/src/notify_email.c b/src/notify_email.c
index c77b2d19..0120a403 100644
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -28,7 +28,6 @@
 
 #include <auth-client.h>
 #include <libesmtp.h>
-#include <pthread.h>
 
 #define MAXSTRING               256
 
diff --git a/src/nut.c b/src/nut.c
index 17eb1b9a..a033e2f6 100644
--- a/src/nut.c
+++ b/src/nut.c
@@ -28,7 +28,6 @@
 #include "common.h"
 #include "plugin.h"
 
-#include <pthread.h>
 #include <upsclient.h>
 
 #if HAVE_UPSCONN_T
diff --git a/src/perl.c b/src/perl.c
index 16db312a..7d78630e 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -63,8 +63,6 @@
 
 #include "filter_chain.h"
 
-#include <pthread.h>
-
 #if !defined(USE_ITHREADS)
 # error "Perl does not support ithreads!"
 #endif /* !defined(USE_ITHREADS) */
diff --git a/src/pinba.c b/src/pinba.c
index 980fbf26..cfc07774 100644
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -28,7 +28,6 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#include <pthread.h>
 #include <netdb.h>
 #include <poll.h>
 
diff --git a/src/ping.c b/src/ping.c
index 88661e94..e16ba077 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -30,7 +30,6 @@
 #include "configfile.h"
 #include "utils_complain.h"
 
-#include <pthread.h>
 #include <netinet/in.h>
 #if HAVE_NETDB_H
 # include <netdb.h> /* NI_MAXHOST */
diff --git a/src/postgresql.c b/src/postgresql.c
index 759560e8..41ce95cd 100644
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -40,10 +40,6 @@
 #include "utils_db_query.h"
 #include "utils_complain.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
 #include <pg_config_manual.h>
 #include <libpq-fe.h>
 
diff --git a/src/python.c b/src/python.c
index 1ed6dc01..61d464d8 100644
--- a/src/python.c
+++ b/src/python.c
@@ -28,9 +28,6 @@
 #include <structmember.h>
 
 #include <signal.h>
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
 
 #include "collectd.h"
 #include "common.h"
diff --git a/src/redis.c b/src/redis.c
index 919a8312..0814126c 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -25,7 +25,6 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#include <pthread.h>
 #include <sys/time.h>
 #include <hiredis/hiredis.h>
 
diff --git a/src/rrdtool.c b/src/rrdtool.c
index 3cd6d6bb..21b01d93 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -32,10 +32,6 @@
 
 #include <rrd.h>
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
 /*
  * Private types
  */
diff --git a/src/sigrok.c b/src/sigrok.c
index 6c781f81..d8c65c08 100644
--- a/src/sigrok.c
+++ b/src/sigrok.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <pthread.h>
 
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
diff --git a/src/snmp.c b/src/snmp.c
index 89cbc460..6a5bb8b9 100644
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -29,8 +29,6 @@
 #include "plugin.h"
 #include "utils_complain.h"
 
-#include <pthread.h>
-
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 
diff --git a/src/statsd.c b/src/statsd.c
index 3c088618..1819b3ea 100644
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -32,8 +32,6 @@
 #include "utils_complain.h"
 #include "utils_latency.h"
 
-#include <pthread.h>
-
 #include <sys/types.h>
 #include <netdb.h>
 #include <poll.h>
diff --git a/src/threshold.c b/src/threshold.c
index e849b1d8..94a4f024 100644
--- a/src/threshold.c
+++ b/src/threshold.c
@@ -31,7 +31,6 @@
 #include "utils_threshold.h"
 
 #include <assert.h>
-#include <pthread.h>
 
 /*
  * Threshold management
diff --git a/src/unixsock.c b/src/unixsock.c
index 1840e34c..d4bf0047 100644
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -36,9 +36,6 @@
 #include "utils_cmd_putval.h"
 #include "utils_cmd_putnotif.h"
 
-/* Folks without pthread will need to disable this plugin. */
-#include <pthread.h>
-
 #include <sys/stat.h>
 #include <sys/un.h>
 
diff --git a/src/write_graphite.c b/src/write_graphite.c
index 0b8ab41c..5acda6e0 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -51,9 +51,6 @@
 #include "utils_complain.h"
 #include "utils_format_graphite.h"
 
-/* Folks without pthread will need to disable this plugin. */
-#include <pthread.h>
-
 #include <netdb.h>
 
 #define WG_DEFAULT_NODE "localhost"
diff --git a/src/write_http.c b/src/write_http.c
index 8dd37c45..779c94f6 100644
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -29,10 +29,6 @@
 #include "utils_cache.h"
 #include "utils_format_json.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
 #include <curl/curl.h>
 
 #ifndef WRITE_HTTP_DEFAULT_BUFFER_SIZE
diff --git a/src/write_kafka.c b/src/write_kafka.c
index 10ae5a57..e881593b 100644
--- a/src/write_kafka.c
+++ b/src/write_kafka.c
@@ -36,7 +36,6 @@
 
 #include <stdint.h>
 #include <librdkafka/rdkafka.h>
-#include <pthread.h>
 #include <zlib.h>
 #include <errno.h>
 
diff --git a/src/write_log.c b/src/write_log.c
index ebf0e124..db09849f 100644
--- a/src/write_log.c
+++ b/src/write_log.c
@@ -32,9 +32,6 @@
 
 #include "utils_format_graphite.h"
 
-/* Folks without pthread will need to disable this plugin. */
-#include <pthread.h>
-
 #include <netdb.h>
 
 #define WL_BUF_SIZE 8192
diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index 9a6fdf26..fb80ba28 100644
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
@@ -34,8 +34,6 @@
 #include "configfile.h"
 #include "utils_cache.h"
 
-#include <pthread.h>
-
 #if HAVE_STDINT_H
 # define MONGO_HAVE_STDINT 1
 #else
diff --git a/src/write_redis.c b/src/write_redis.c
index a79eb36b..5c299a48 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -29,7 +29,6 @@
 #include "common.h"
 #include "configfile.h"
 
-#include <pthread.h>
 #include <sys/time.h>
 #include <hiredis/hiredis.h>
 
diff --git a/src/write_riemann.c b/src/write_riemann.c
index 2936dfa4..ac4e9f58 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -30,7 +30,6 @@
 
 #include <riemann/riemann-client.h>
 #include <errno.h>
-#include <pthread.h>
 
 #include "collectd.h"
 #include "plugin.h"
diff --git a/src/write_sensu.c b/src/write_sensu.c
index 475354c8..d37792b4 100644
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <netdb.h>
 #include <inttypes.h>
-#include <pthread.h>
 #include <stddef.h>
 
 #include <stdlib.h>
diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index 46028ba1..2bd27072 100644
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
@@ -48,7 +48,6 @@
 
 #include "utils_cache.h"
 
-#include <pthread.h>
 #include <netdb.h>
 
 #ifndef WT_DEFAULT_NODE
-- 
2.11.0