mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sdk: make C++11 plugins build again

Browse Source 
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:
Giulio Camuffo
2013-12-09 22:47:58 +01:00
committed by Kristian Høgsberg
parent 80c798bdf0
commit 1aaf3e42e2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+4
View File
@@ -43,6 +43,10 @@
#define DEFAULT_NUM_WORKSPACES 1 #define DEFAULT_NUM_WORKSPACES 1
#define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200 #define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200
#ifndef static_assert
#define static_assert(cond, msg)
#endif
struct focus_state { struct focus_state {
struct weston_seat *seat; struct weston_seat *seat;
struct workspace *ws; struct workspace *ws;
src/compositor.h
-4
View File
@@ -45,10 +45,6 @@ extern "C" {
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
#ifndef static_assert
#define static_assert(cond, msg)
#endif
#define container_of(ptr, type, member) ({ \ #define container_of(ptr, type, member) ({ \
const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \ const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );}) (type *)( (char *)__mptr - offsetof(type,member) );})