Merge branch 'pull/master'

Conflicts:

	src/memory.c

diff --cc src/memory.c
index 47725a1c05bd3d09b2b9f381ea4d8f455f408ad9,47b3cb31a77377aa31362cc4bce187905158eef1..3fbd33fb0c1da1a90cb666e1e6df044a711a2f64
--- 1/src/memory.c
--- 2/src/memory.c
+++ b/src/memory.c
@@@ -43,17 -43,11 +43,11 @@@
  # include <mach/vm_statistics.h>
  #endif
  
- #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 */
@@@ -66,15 -60,18 +60,18 @@@
  #elif HAVE_LIBKSTAT
  static int pagesize;
  static kstat_t *ksp;
- #endif /* HAVE_LIBKSTAT */
+ /* #endif HAVE_LIBKSTAT */
+ 
+ #else
+ # error "No applicable input method."
+ #endif
  
- #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 */