mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-07-21 10:44:25 +00:00
sdk: make C++11 plugins build again
compositor.h must not define a 'static_assert' macro, since that conflicts with the new 'static_assert' in the standard and breaks the build.
This commit is contained in:
parent
80c798bdf0
commit
1aaf3e42e2
|
@ -43,6 +43,10 @@
|
|||
#define DEFAULT_NUM_WORKSPACES 1
|
||||
#define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200
|
||||
|
||||
#ifndef static_assert
|
||||
#define static_assert(cond, msg)
|
||||
#endif
|
||||
|
||||
struct focus_state {
|
||||
struct weston_seat *seat;
|
||||
struct workspace *ws;
|
||||
|
|
|
@ -45,10 +45,6 @@ extern "C" {
|
|||
|
||||
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
|
||||
|
||||
#ifndef static_assert
|
||||
#define static_assert(cond, msg)
|
||||
#endif
|
||||
|
||||
#define container_of(ptr, type, member) ({ \
|
||||
const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
|
||||
(type *)( (char *)__mptr - offsetof(type,member) );})
|
||||
|
|
Loading…
Reference in a new issue