diff options
| author | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:52 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:52 +0100 |
| commit | b6357ff41de179d0aa2e35a6d574e5749fe09002 (patch) | |
| tree | ff038e98f4569fa3ba217266e6d288410ed84cd4 /src/libnm-platform/nmp-plobj.c | |
| parent | 535ecf92edd8ad054ae8102a224c3dd8f3acf967 (diff) | |
| parent | 70e18d99b8e3e77bb37e218d7ac582130156f8ef (diff) | |
Update upstream source from tag 'upstream/1.45.90'
Update to upstream version '1.45.90' with Debian dir d723a85d75b9a8958dee17b97673a3fd9a80e18c
Diffstat (limited to 'src/libnm-platform/nmp-plobj.c')
| -rw-r--r-- | src/libnm-platform/nmp-plobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnm-platform/nmp-plobj.c b/src/libnm-platform/nmp-plobj.c index d3643ae1..70664634 100644 --- a/src/libnm-platform/nmp-plobj.c +++ b/src/libnm-platform/nmp-plobj.c @@ -424,7 +424,7 @@ nm_platform_ip4_address_to_string(const NMPlatformIP4Address *address, char *buf (address->lifetime == address->preferred) ? str_lft_p : (_lifetime_to_string(address->timestamp, - address->lifetime ? MIN(address->preferred, address->lifetime) + address->lifetime ? NM_MIN(address->preferred, address->lifetime) : NM_PLATFORM_LIFETIME_PERMANENT, now, str_pref, @@ -522,7 +522,7 @@ nm_platform_ip6_address_to_string(const NMPlatformIP6Address *address, char *buf (address->lifetime == address->preferred) ? str_lft_p : (_lifetime_to_string(address->timestamp, - address->lifetime ? MIN(address->preferred, address->lifetime) + address->lifetime ? NM_MIN(address->preferred, address->lifetime) : NM_PLATFORM_LIFETIME_PERMANENT, now, str_pref, |