[PATCH xserver] meson: Fix epoll detection

[Peter Hutterer]

On Tue, Aug 08, 2017 at 11:16:13AM -0400, Peter Harris wrote:
> The epoll code depends on epoll_create1, not epoll_create.
> 
> The trinary " ? 1 : false" is used because HAVE_EPOLL_CREATE1 is tested
> with #if instead of #ifdef.
> 
> Signed-off-by: Peter Harris <pharris at opentext.com>
> ---
>  include/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/meson.build b/include/meson.build
> index 78ec521ac..850c140fa 100644
> --- a/include/meson.build
> +++ b/include/meson.build
> @@ -110,7 +110,7 @@ conf_data.set('HAVE_UNISTD_H', cc.has_header('unistd.h'))
>  conf_data.set('HAVE_ARC4RANDOM_BUF', cc.has_function('arc4random_buf', dependencies: libbsd_dep))
>  conf_data.set('HAVE_BACKTRACE', cc.has_function('backtrace'))
>  conf_data.set('HAVE_CBRT', cc.has_function('cbrt'))
> -conf_data.set('HAVE_EPOLL_CREATE', cc.has_function('epoll_create'))
> +conf_data.set('HAVE_EPOLL_CREATE1', cc.has_function('epoll_create1') ? 1 : false)

might be worth using conf_data.set10(...) then? that should write out 0/1
correctly.
http://mesonbuild.com/Reference-manual.html#configuration-data-object

Cheers,
   Peter

>  conf_data.set('HAVE_FFS', cc.has_function('ffs'))
>  conf_data.set('HAVE_GETUID', cc.has_function('getuid'))
>  conf_data.set('HAVE_GETEUID', cc.has_function('geteuid'))
> -- 
> 2.11.0
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>