diff options
| author | Michael Biebl <biebl@debian.org> | 2016-10-01 00:34:40 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-10-01 00:34:40 +0200 |
| commit | 636b831a0f663aa53b0e186d5dc44a623150d376 (patch) | |
| tree | 48ef86c0ff45c7c2c7fcddf910a9102d768c957c /src/rdisc/nm-rdisc.c | |
| parent | c8a2b286220c6b2bbde384d0d7dd2629b66e312c (diff) | |
| parent | 270c4830551c9810ad4e83f9a1db2b1cb946208c (diff) | |
Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
Diffstat (limited to 'src/rdisc/nm-rdisc.c')
| -rw-r--r-- | src/rdisc/nm-rdisc.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c index cf993bc3..3bc69750 100644 --- a/src/rdisc/nm-rdisc.c +++ b/src/rdisc/nm-rdisc.c @@ -87,18 +87,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; G_DEFINE_TYPE (NMRDisc, nm_rdisc, G_TYPE_OBJECT) -#define NM_RDISC_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 NMRDisc *_self2 = (_self); \ - \ - nm_assert (NM_IS_RDISC (_self)); \ - _self->_priv; \ - }) +#define NM_RDISC_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMRDisc, NM_IS_RDISC) /*****************************************************************************/ |