vma-iter: Treat Haiku like BeOS.

* lib/vma-iter.h (VMA_ITERATE_SUPPORTED): Define on Haiku as well.
* lib/vma-iter.c (vma_iterate) [Haiku]: Use the BeOS API.

diff --git a/ChangeLog b/ChangeLog
index 5f8c93ea05b3a2f3e92297514c2ae80fd65e1d07..b5fb6448201871ecfd368d08e9869d6a184e7955 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-25  Bruno Haible  <bruno@clisp.org>
+
+       vma-iter: Treat Haiku like BeOS.
+       * lib/vma-iter.h (VMA_ITERATE_SUPPORTED): Define on Haiku as well.
+       * lib/vma-iter.c (vma_iterate) [Haiku]: Use the BeOS API.
+
 2011-01-25  Eric Blake  <eblake@redhat.com>
 
        c-stack: fix regression on cygwin when libsigsegv is present

diff --git a/lib/vma-iter.c b/lib/vma-iter.c
index 8ef865de7ffd237cd5b12baed5493fd841cdfa31..46c021297a51b7de172bb3a0d525b9e59b747341 100644 (file)
--- a/lib/vma-iter.c
+++ b/lib/vma-iter.c
@@ -40,7 +40,7 @@
 # include <windows.h>
 #endif
 
-#if defined __BEOS__ /* BeOS */
+#if defined __BEOS__ || defined __HAIKU__ /* BeOS, Haiku */
 # include <OS.h>
 #endif
 
@@ -466,7 +466,7 @@ vma_iterate (vma_iterate_callback_fn callback, void *data)
       address = (unsigned long)info.BaseAddress + info.RegionSize;
     }
 
-#elif defined __BEOS__
+#elif defined __BEOS__ || defined __HAIKU__
   /* Use the BeOS specific API.  */
 
   area_info info;

diff --git a/lib/vma-iter.h b/lib/vma-iter.h
index e61898ec38bfd5a31686fa098f55ab2494a1ab6a..c3bc9cfb1079f24e9edeecc7d0a9124ecdce1970 100644 (file)
--- a/lib/vma-iter.h
+++ b/lib/vma-iter.h
@@ -51,7 +51,7 @@ extern void vma_iterate (vma_iterate_callback_fn callback, void *data);
    this platform.
    Note that even when this macro is defined, vma_iterate() may still fail to
    find any virtual memory area, for example if /proc is not mounted.  */
-#if defined __linux__ || defined __FreeBSD__ || defined __NetBSD__ || defined __sgi || defined __osf__ || (defined __APPLE__ && defined __MACH__) || (defined _WIN32 || defined __WIN32__) || defined __CYGWIN__ || defined __BEOS__
+#if defined __linux__ || defined __FreeBSD__ || defined __NetBSD__ || defined __sgi || defined __osf__ || (defined __APPLE__ && defined __MACH__) || (defined _WIN32 || defined __WIN32__) || defined __CYGWIN__ || defined __BEOS__ || defined __HAIKU__
 # define VMA_ITERATE_SUPPORTED 1
 #endif