From 760b589b90bd4187454960949ed3eb0036512a1e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 26 Jan 2011 02:13:52 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ lib/vma-iter.c | 4 ++-- lib/vma-iter.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f8c93ea0..b5fb64482 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-25 Bruno Haible + + 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 c-stack: fix regression on cygwin when libsigsegv is present diff --git a/lib/vma-iter.c b/lib/vma-iter.c index 8ef865de7..46c021297 100644 --- a/lib/vma-iter.c +++ b/lib/vma-iter.c @@ -40,7 +40,7 @@ # include #endif -#if defined __BEOS__ /* BeOS */ +#if defined __BEOS__ || defined __HAIKU__ /* BeOS, Haiku */ # include #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 e61898ec3..c3bc9cfb1 100644 --- 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 -- 2.11.0