diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
| commit | b3c2e57e153446d32d16f2d99e6abbb50146dddb (patch) | |
| tree | e71a5353ff26c7e33cbe6e482874bedc1c3cc1cd /src/core/devices/bluetooth | |
| parent | 1d817ebf5302c204e3ce9d3512db13bf834fee33 (diff) | |
| parent | ed857ba34efc2ec899f2e3fbd8e35324561a55b2 (diff) | |
Merge tag 'debian/1.42.0-1' into ubuntu/master
network-manager Debian release 1.42.0-1
Diffstat (limited to 'src/core/devices/bluetooth')
| -rw-r--r-- | src/core/devices/bluetooth/nm-bluez-manager.c | 5 | ||||
| -rw-r--r-- | src/core/devices/bluetooth/nm-bluez-manager.h | 2 | ||||
| -rw-r--r-- | src/core/devices/bluetooth/nm-device-bt.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c index 6bc00faf..ac26ede8 100644 --- a/src/core/devices/bluetooth/nm-bluez-manager.c +++ b/src/core/devices/bluetooth/nm-bluez-manager.c @@ -1010,8 +1010,9 @@ _network_server_get_bluez_manager(const NMBtVTableNetworkServer *vtable_network_ { NMBluezManager *self; - self = (NMBluezManager *) (((char *) vtable_network_server) - - G_STRUCT_OFFSET(NMBluezManager, _priv.vtable_network_server)); + self = NM_CAST_ALIGN(NMBluezManager, + (((char *) vtable_network_server) + - G_STRUCT_OFFSET(NMBluezManager, _priv.vtable_network_server))); g_return_val_if_fail(NM_IS_BLUEZ_MANAGER(self), NULL); diff --git a/src/core/devices/bluetooth/nm-bluez-manager.h b/src/core/devices/bluetooth/nm-bluez-manager.h index 299f5c3b..7c823c64 100644 --- a/src/core/devices/bluetooth/nm-bluez-manager.h +++ b/src/core/devices/bluetooth/nm-bluez-manager.h @@ -8,7 +8,7 @@ #define NM_TYPE_BLUEZ_MANAGER (nm_bluez_manager_get_type()) #define NM_BLUEZ_MANAGER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_BLUEZ_MANAGER, NMBluezManager)) + (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_BLUEZ_MANAGER, NMBluezManager)) #define NM_BLUEZ_MANAGER_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_BLUEZ_MANAGER, NMBluezManagerClass)) #define NM_IS_BLUEZ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_BLUEZ_MANAGER)) diff --git a/src/core/devices/bluetooth/nm-device-bt.h b/src/core/devices/bluetooth/nm-device-bt.h index 59457fba..bf17e91f 100644 --- a/src/core/devices/bluetooth/nm-device-bt.h +++ b/src/core/devices/bluetooth/nm-device-bt.h @@ -9,7 +9,7 @@ #include "devices/nm-device.h" #define NM_TYPE_DEVICE_BT (nm_device_bt_get_type()) -#define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DEVICE_BT, NMDeviceBt)) +#define NM_DEVICE_BT(obj) (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DEVICE_BT, NMDeviceBt)) #define NM_DEVICE_BT_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DEVICE_BT, NMDeviceBtClass)) #define NM_IS_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DEVICE_BT)) |