about summary refs log tree commit diff
path: root/src/nm-auth-subject.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-10-01 00:34:40 +0200
committerMichael Biebl <biebl@debian.org>2016-10-01 00:34:40 +0200
commit636b831a0f663aa53b0e186d5dc44a623150d376 (patch)
tree48ef86c0ff45c7c2c7fcddf910a9102d768c957c /src/nm-auth-subject.c
parentc8a2b286220c6b2bbde384d0d7dd2629b66e312c (diff)
parent270c4830551c9810ad4e83f9a1db2b1cb946208c (diff)
Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
Diffstat (limited to 'src/nm-auth-subject.c')
-rw-r--r--src/nm-auth-subject.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index eb496b28..54d35959 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -68,18 +68,7 @@ struct _NMAuthSubjectClass {
 
 G_DEFINE_TYPE (NMAuthSubject, nm_auth_subject, G_TYPE_OBJECT)
 
-#define NM_AUTH_SUBJECT_GET_PRIVATE(self) \
-	({ \
-		/* preserve the const-ness of self. Unfortunately, that
-		 * way, @self cannot be a void pointer */ \
-		typeof (self) _self = (self); \
-		\
-		/* Get compiler error if variable is of wrong type */ \
-		_nm_unused const NMAuthSubject *_self2 = (_self); \
-		\
-		nm_assert (NM_IS_AUTH_SUBJECT (_self)); \
-		&_self->_priv; \
-	})
+#define NM_AUTH_SUBJECT_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMAuthSubject, NM_IS_AUTH_SUBJECT)
 
 /**************************************************************/