From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 15 Feb 2016 13:45:49 +0000 (+0000)
Subject: dbus-internals: add _DBUS_ALIGNOF
X-Git-Tag: dbus-1.10.8~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca9ea25e1122b33eaf15c63e4c34ebc157c39f6f;p=thirdparty%2Fdbus.git

dbus-internals: add _DBUS_ALIGNOF

This is useful when making static assertions about our types'
properties.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Thiago Macieira <thiago@kde.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=94136
---

diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 3eb8749f3..df8e9643d 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -195,6 +195,9 @@ extern const char *_dbus_return_if_fail_warning_format;
 #define _DBUS_STRUCT_OFFSET(struct_type, member)	\
     ((intptr_t) ((unsigned char*) &((struct_type*) 0)->member))
 
+#define _DBUS_ALIGNOF(type) \
+    (_DBUS_STRUCT_OFFSET (struct { char _1; type _2; }, _2))
+
 #ifdef DBUS_DISABLE_CHECKS
 /* this is an assert and not an error, but in the typical --disable-checks case (you're trying
  * to really minimize code size), disabling these assertions makes sense.