X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fuuid.c;h=a5fba034faf22f518f496deb5125a10bb8a24f8b;hp=39b1fe6ffbd22001c77628265629d7fe1faf6831;hb=f22b9ecc5e5d204e5dcb6861d6fd8039e1fb0181;hpb=06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4

diff --git a/src/uuid.c b/src/uuid.c
index 39b1fe6f..a5fba034 100644
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -26,10 +26,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
-#if HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTLBYNAME) ||                \
+    defined(__OpenBSD__)
+/* Implies have BSD variant */
 #include <sys/sysctl.h>
 #endif
 
@@ -42,13 +44,10 @@ static char *uuidfile;
 static const char *config_keys[] = {"UUIDFile"};
 
 static int looks_like_a_uuid(const char *uuid) {
-  int len;
-
   if (!uuid)
     return 0;
 
-  len = strlen(uuid);
-
+  size_t len = strlen(uuid);
   if (len < UUID_PRINTABLE_COMPACT_LENGTH)
     return 0;