mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move un-namespaced container_of into private header

Browse source
This commit is contained in:
Kristian Høgsberg 2012-10-19 23:06:53 -04:00
parent bdd272f024
commit 7ec35d8e13
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/data-device.c
View file

@ -25,6 +25,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include "wayland-private.h"
#include "wayland-server.h" #include "wayland-server.h"
static void static void

4
src/wayland-private.h
View file

@ -30,6 +30,10 @@
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
#define container_of(ptr, type, member) ({ \
const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );})
#define WL_ZOMBIE_OBJECT ((void *) 2) #define WL_ZOMBIE_OBJECT ((void *) 2)
#define WL_MAP_SERVER_SIDE 0 #define WL_MAP_SERVER_SIDE 0

1
src/wayland-shm.c
View file

@ -33,6 +33,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#include "wayland-private.h"
#include "wayland-server.h" #include "wayland-server.h"
struct wl_shm_pool { struct wl_shm_pool {

4
src/wayland-util.h
View file

@ -39,10 +39,6 @@ extern "C" {
#define WL_EXPORT #define WL_EXPORT
#endif #endif
#define container_of(ptr, type, member) ({ \
const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );})
struct wl_message { struct wl_message {
const char *name; const char *name;
const char *signature; const char *signature;