Merged in master and stable-1.4. Thanks!

Jérémie

On Mon, May 30, 2016 at 4:39 PM, Michael Jeanson <mjeanson at efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  include/babeltrace/compat/string.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/babeltrace/compat/string.h b/include/babeltrace/compat/string.h
> index 7a574e6..6092616 100644
> --- a/include/babeltrace/compat/string.h
> +++ b/include/babeltrace/compat/string.h
> @@ -26,7 +26,7 @@
>  #include <string.h>
>  #include <stdlib.h>
>
> -#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
> +#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
>
>  /* XSI-compliant strerror_r */
>  static inline
> --
> 2.7.4
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com