[PATCH][cxxabi] function declaration not under __APPLE__ define

Nick Kledzik kledzik at apple.com
Sat Apr 12 16:30:58 PDT 2014


LGTM.

Committed in r206121.

-Nick

On Apr 11, 2014, at 5:09 AM, Patrick Wildt <mail at patrick-wildt.de> wrote:

> Hi,
> 
> I've been working on porting libc++ and libc++abi to Bitrig.
> 
> While there I've found a few things.
> 
> This diff fixes a bug where there's a function declarataion, although
> the prototype is under __APPLE__, so !__APPLE__ compile will fail.
> 
> \Patrick
> 
> From 8924d2c5b8bd6d6c264fe7f5348bb8818e8ce3c9 Mon Sep 17 00:00:00 2001
> From: Patrick Wildt <patrick at blueri.se>
> Date: Thu, 10 Apr 2014 17:14:22 +0200
> Subject: [PATCH] This should be in __APPLE__, else compile fails.
> 
> ---
> src/Unwind/UnwindCursor.hpp | 2 ++
> 1 file changed, 2 insertions(+)
> 
> diff --git a/src/Unwind/UnwindCursor.hpp b/src/Unwind/UnwindCursor.hpp
> index 235922f..aa14dd1 100644
> --- a/src/Unwind/UnwindCursor.hpp
> +++ b/src/Unwind/UnwindCursor.hpp
> @@ -151,10 +151,12 @@ void DwarfFDECache<A>::removeAllIn(pint_t mh) {
>   _LIBUNWIND_LOG_NON_ZERO(::pthread_rwlock_unlock(&_lock));
> }
> 
> +#if __APPLE__
> template <typename A>
> void DwarfFDECache<A>::dyldUnloadHook(const struct mach_header *mh, intptr_t ) {
>   removeAllIn((pint_t) mh);
> }
> +#endif
> 
> template <typename A>
> void DwarfFDECache<A>::iterateCacheEntries(void (*func)(
> -- 
> 1.8.5.2 (Apple Git-48)
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits




More information about the cfe-commits mailing list