From: Edgar Fuß <ef@math.uni-bonn.de>
Date: Thu, 9 Jul 2020 10:42:22 +0000 (+0200)
Subject: Revert re-ordering of pagesize definition
X-Git-Tag: collectd-5.12.0~14^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=003e2870cd5b6408dadd1f4ed729f34650d0a642;p=thirdparty%2Fcollectd.git

Revert re-ordering of pagesize definition

Revert a re-ordering of #ifdef'd block that may have lead to pagesize being defined, but unused.
---

diff --git a/src/memory.c b/src/memory.c
index 60546a0cb..4bf4ed2c5 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -68,10 +68,6 @@ static mach_port_t port_host;
 static vm_size_t pagesize;
 /* #endif HAVE_HOST_STATISTICS */
 
-#elif HAVE_SYSCTL
-static int pagesize;
-/* #endif HAVE_SYSCTL */
-
 #elif HAVE_SYSCTLBYNAME
 /* no global variables */
 /* #endif HAVE_SYSCTLBYNAME */
@@ -86,6 +82,11 @@ static kstat_t *ksp;
 static kstat_t *ksz;
 /* #endif HAVE_LIBKSTAT */
 
+#elif HAVE_SYSCTL && __OpenBSD__
+/* OpenBSD variant does not have sysctlbyname */
+static int pagesize;
+/* #endif HAVE_SYSCTL && __OpenBSD__ */
+
 #elif HAVE_LIBSTATGRAB
 /* no global variables */
 /* endif HAVE_LIBSTATGRAB */