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>
> ---
>  formats/lttng-live/lttng-live.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h
> index e00a51e..b315458 100644
> --- a/formats/lttng-live/lttng-live.h
> +++ b/formats/lttng-live/lttng-live.h
> @@ -25,6 +25,7 @@
>   */
>
>  #include <stdint.h>
> +#include <sys/param.h>
>  #include "lttng-viewer-abi.h"
>
>  #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT      5344
> --
> 2.7.4
>



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