From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 19 Mar 2016 15:47:33 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~31
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=f14feb1eddfe5760a64640b98ab7bbc5c493f614;hp=d9db39b8e8b5e9a34d955d057574f6ddd00759e6

Merge branch 'collectd-5.4' into collectd-5.5
---

diff --git a/src/daemon/utils_random.c b/src/daemon/utils_random.c
index 548d1d81..fee08717 100644
--- a/src/daemon/utils_random.c
+++ b/src/daemon/utils_random.c
@@ -24,12 +24,12 @@
  *   Florian Forster <octo at collectd.org>
  **/
 
-#include <pthread.h>
-
 #include "collectd.h"
 #include "utils_time.h"
 #include "utils_random.h"
 
+#include <pthread.h>
+
 
 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 static _Bool have_seed = 0;
diff --git a/src/utils_latency.c b/src/utils_latency.c
index 7a607e43..ca7d5fab 100644
--- a/src/utils_latency.c
+++ b/src/utils_latency.c
@@ -24,14 +24,14 @@
  *   Florian Forster <ff at octo.it>
  **/
 
-#include <math.h>
-#include <limits.h>
-
 #include "collectd.h"
 #include "plugin.h"
 #include "utils_latency.h"
 #include "common.h"
 
+#include <math.h>
+#include <limits.h>
+
 #ifndef LLONG_MAX
 # define LLONG_MAX 9223372036854775807LL
 #endif