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

shell: Make sure the shell implementation and protocol versions match

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-12-08 22:27:11 -08:00
parent 1e65840b61
commit 8d344a0548
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+3
View File
@@ -3421,6 +3421,9 @@ xdg_shell_unversioned_dispatch(const void *implementation,
#define XDG_SERVER_VERSION 1 #define XDG_SERVER_VERSION 1
static_assert(XDG_SERVER_VERSION == XDG_SHELL_VERSION_CURRENT,
"shell implementation doesn't match protocol version");
if (args[0].i != XDG_SERVER_VERSION) { if (args[0].i != XDG_SERVER_VERSION) {
wl_resource_post_error(resource, wl_resource_post_error(resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
src/compositor.h
+4
View File
@@ -45,6 +45,10 @@ 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) );})