Re: [PATCH 2/4] cleanup some FreeBSD-related workarounds

[Eric Wong <e@80x24.org>]

Eric Wong <mwrap-perl@80x24.org> wrote:
> diff --git a/Mwrap.xs b/Mwrap.xs
> index e888a1c..3392fee 100644
> --- a/Mwrap.xs
> +++ b/Mwrap.xs
> @@ -124,19 +130,20 @@ __attribute__((constructor)) static void resolve_malloc(void)
>  		/* initialize mutexes used by urcu-bp */
>  		rcu_read_lock();
>  		rcu_read_unlock();
> +#ifndef __FreeBSD__
> +	} else {
> +		if (!real_malloc) {
> +			resolving_malloc = 1;
> +			real_malloc = dlsym(RTLD_NEXT, "malloc");
> +		}
> +		real_free = dlsym(RTLD_NEXT, "free");
> +		if (!real_malloc || !real_free) {
> +			fprintf(stderr, "missing malloc/aligned_alloc/free\n"
> +				"\t%p %p\n", real_malloc, real_free);
> +			_exit(1);
> +		}
>  	}
> -#else /* !FreeBSD (tested on GNU/Linux) */
> -	if (!real_malloc) {
> -		resolving_malloc = 1;
> -		real_malloc = dlsym(RTLD_NEXT, "malloc");
> -	}
> -	real_free = dlsym(RTLD_NEXT, "free");
> -	if (!real_malloc || !real_free) {
> -		fprintf(stderr, "missing malloc/aligned_alloc/free\n"
> -			"\t%p %p\n", real_malloc, real_free);
> -		_exit(1);
> -	}
> -#endif /* !FreeBSD */
> +#endif /* !__FreeBSD__ */
>  	err = pthread_atfork(call_rcu_before_fork,
>  				call_rcu_after_fork_parent,
>  				call_rcu_after_fork_child);

Will squash this in so that it actually compiles :x

diff --git a/Mwrap.xs b/Mwrap.xs
index 3392fee..bec4664 100644
--- a/Mwrap.xs
+++ b/Mwrap.xs
@@ -142,8 +142,8 @@ __attribute__((constructor)) static void resolve_malloc(void)
 				"\t%p %p\n", real_malloc, real_free);
 			_exit(1);
 		}
-	}
 #endif /* !__FreeBSD__ */
+	}
 	err = pthread_atfork(call_rcu_before_fork,
 				call_rcu_after_fork_parent,
 				call_rcu_after_fork_child);