[PATCH libinput] tablet: remove C++ static_assert

Jonas Ã…dahl jadahl at gmail.com
Sun May 15 03:26:34 UTC 2016


On Sun, May 15, 2016 at 06:03:14AM +0300, Baruch Siach wrote:
> static_assert() is C++ only. Build may fail with:

static_assert() is not C++ only, it is part of C11. We should probably
either just require C11, or define a no-op fallback when it is not
defined.


Jonas

> 
>   CCLD     event-debug
> ../src/.libs/libinput.so: undefined reference to `static_assert'
> collect2: error: ld returned 1 exit status
> 
> Use just assert() like the rest of the code.
> 
> Signed-off-by: Baruch Siach <baruch at tkos.co.il>
> ---
>  src/evdev-tablet.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c
> index 4e8b920a3ec8..f4adc0c39f82 100644
> --- a/src/evdev-tablet.c
> +++ b/src/evdev-tablet.c
> @@ -1187,9 +1187,7 @@ static void
>  tablet_mark_all_axes_changed(struct tablet_dispatch *tablet,
>  			     struct libinput_tablet_tool *tool)
>  {
> -	static_assert(sizeof(tablet->changed_axes) ==
> -			      sizeof(tool->axis_caps),
> -		      "Mismatching array sizes");
> +	assert(sizeof(tablet->changed_axes) == sizeof(tool->axis_caps));
>  
>  	memcpy(tablet->changed_axes,
>  	       tool->axis_caps,
> -- 
> 2.8.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list