From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 2 Jul 2007 13:59:21 +0000 (+0200)
Subject: memory plugin: Check for `HAVE_HOST_STATISTICS' rather than `HOST_VM_INFO'.
X-Git-Tag: collectd-4.1.0~41
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e2df20972ce0692d20479caea66b894edb5cc1b7;p=collectd.git

memory plugin: Check for `HAVE_HOST_STATISTICS' rather than `HOST_VM_INFO'.
---

diff --git a/src/memory.c b/src/memory.c
index cb7e6882..47725a1c 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -43,17 +43,17 @@
 # include <mach/vm_statistics.h>
 #endif
 
-#if defined (HOST_VM_INFO) || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT
+#if HAVE_HOST_STATISTICS || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT
 # define MEMORY_HAVE_READ 1
 #else
 # define MEMORY_HAVE_READ 0
 #endif
 
 /* vm_statistics_data_t */
-#if defined(HOST_VM_INFO)
+#if HAVE_HOST_STATISTICS
 static mach_port_t port_host;
 static vm_size_t pagesize;
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
 
 #elif HAVE_SYSCTLBYNAME
 /* no global variables */
@@ -71,10 +71,10 @@ static kstat_t *ksp;
 #if MEMORY_HAVE_READ
 static int memory_init (void)
 {
-#if defined(HOST_VM_INFO)
+#if HAVE_HOST_STATISTICS
 	port_host = mach_host_self ();
 	host_page_size (port_host, &pagesize);
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
 
 #elif HAVE_SYSCTLBYNAME
 /* no init stuff */
@@ -114,7 +114,7 @@ static void memory_submit (const char *type_instance, gauge_t value)
 
 static int memory_read (void)
 {
-#if defined(HOST_VM_INFO)
+#if HAVE_HOST_STATISTICS
 	kern_return_t status;
 	vm_statistics_data_t   vm_data;
 	mach_msg_type_number_t vm_data_len;
@@ -165,7 +165,7 @@ static int memory_read (void)
 	memory_submit ("active",   active);
 	memory_submit ("inactive", inactive);
 	memory_submit ("free",     free);
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
 
 #elif HAVE_SYSCTLBYNAME
 	/*