Merge branch 'collectd-5.4' into collectd-5.5

diff --git a/src/daemon/utils_random.c b/src/daemon/utils_random.c
index 548d1d8..fee0871 100644 (file)
--- 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 7a607e4..ca7d5fa 100644 (file)
--- 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