summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a905d39)
raw | patch | inline | side by side (parent: a905d39)
author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Mon, 2 Jul 2007 13:59:21 +0000 (15:59 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Mon, 2 Jul 2007 13:59:21 +0000 (15:59 +0200) |
src/memory.c | patch | blob | history |
diff --git a/src/memory.c b/src/memory.c
index cb7e68823481e0ff6637bd9cc3cf0dc58e04253d..47725a1c05bd3d09b2b9f381ea4d8f455f408ad9 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
# 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 */
#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 */
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;
memory_submit ("active", active);
memory_submit ("inactive", inactive);
memory_submit ("free", free);
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
#elif HAVE_SYSCTLBYNAME
/*