NetworkManager

colin/NetworkManager

Fork 0

Commit Graph

Author	SHA1	Message	Date
Lubomir Rintel	de8bf7421d	n-acd: don't use a return value in deallocator ...so that its prototype is compatible with GDestroyNotify: src/devices/nm-acd-manager.c: In function ‘destroy_address_info’: /usr/include/glib-2.0/glib/gmem.h:120:31: error: cast between incompatible function types from ‘NAcd * ()(NAcd )’ {aka ‘struct NAcd * ()(struct NAcd )’} to ‘void ()(void )’ [-Werror=cast-function-type] GDestroyNotify _destroy = (GDestroyNotify) (destroy); \ ^ src/devices/nm-acd-manager.c:430:2: note: in expansion of macro ‘g_clear_pointer’ g_clear_pointer (&info->acd, n_acd_free); ^~~~~~~~~~~~~~~ The same change was done upstream, so the subsequent subtree pull of n-acd won't mess this up.	2018-04-23 09:50:12 +02:00
Beniamino Galvani	8c3023d471	n-acd: use CLOCK_MONOTONIC timers on older kernels The README states that a kernel >= 3.0 is enough, however CLOCK_BOOTTIME is only available since kernel 3.15. Fall back to CLOCK_MONOTONIC when CLOCK_BOOTTIME is not available. See: https://github.com/nettools/n-acd/pull/3 Signed-off-by: Beniamino Galvani <bgalvani@redhat.com>	2018-04-18 15:22:10 +02:00
Beniamino Galvani	8a01bdc2d1	Merge commit '23cbce4bc9c70fc33d3413fc1b9a5f3303498036' as 'shared/n-acd' Imported n-acd code with command: git subtree add --prefix shared/n-acd git@github.com:nettools/n-acd.git a68b55992dd7b38bdb9dbbdba4a9284ff2c2cce3 --squash To update the library use: git subtree pull --prefix shared/n-acd git@github.com:nettools/n-acd.git master --squash	2018-04-18 15:21:26 +02:00

Author

SHA1

Message

Date

Lubomir Rintel

de8bf7421d

n-acd: don't use a return value in deallocator

...so that its prototype is compatible with GDestroyNotify:

src/devices/nm-acd-manager.c: In function ‘destroy_address_info’:
/usr/include/glib-2.0/glib/gmem.h:120:31: error: cast between incompatible function types from ‘NAcd * (*)(NAcd *)’ {aka ‘struct NAcd * (*)(struct NAcd *)’} to ‘void (*)(void *)’ [-Werror=cast-function-type]
     GDestroyNotify _destroy = (GDestroyNotify) (destroy);                      \
                               ^
src/devices/nm-acd-manager.c:430:2: note: in expansion of macro ‘g_clear_pointer’
  g_clear_pointer (&info->acd, n_acd_free);
  ^~~~~~~~~~~~~~~

The same change was done upstream, so the subsequent subtree pull of n-acd
won't mess this up.

2018-04-23 09:50:12 +02:00

Beniamino Galvani

8c3023d471

n-acd: use CLOCK_MONOTONIC timers on older kernels

The README states that a kernel >= 3.0 is enough, however
CLOCK_BOOTTIME is only available since kernel 3.15.

Fall back to CLOCK_MONOTONIC when CLOCK_BOOTTIME is not available.

See: https://github.com/nettools/n-acd/pull/3

Signed-off-by: Beniamino Galvani <bgalvani@redhat.com>

2018-04-18 15:22:10 +02:00

Beniamino Galvani

8a01bdc2d1

Merge commit '23cbce4bc9c70fc33d3413fc1b9a5f3303498036' as 'shared/n-acd'

Imported n-acd code with command:

  git subtree add --prefix shared/n-acd git@github.com:nettools/n-acd.git a68b55992dd7b38bdb9dbbdba4a9284ff2c2cce3 --squash

To update the library use:

  git subtree pull --prefix shared/n-acd git@github.com:nettools/n-acd.git master --squash

2018-04-18 15:21:26 +02:00

3 Commits