diff options
| author | Martin Pitt <martinpitt@users.noreply.github.com> | 2017-04-21 21:36:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 21:36:56 +0200 |
| commit | 56744c037da0ba2032fba0c7ac116317bb5ae4ae (patch) | |
| tree | db0347ca9acff034003a7d947fd9e77729affa41 /src/basic | |
| parent | 301fb51922d435d5f5ef02d234dc7a271ecca930 (diff) | |
| parent | 62cc1c55cb6909c9b0065bf55940bc5a5780f67b (diff) | |
Merge pull request #5756 from keszybz/make-cleanups
Various meson-independent cleanups from the meson patchset
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/def.h | 4 | ||||
| -rw-r--r-- | src/basic/missing.h | 2 | ||||
| -rw-r--r-- | src/basic/random-util.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/basic/def.h b/src/basic/def.h index 200ea973c1..b1a3bc190b 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -67,10 +67,6 @@ .un.sun_path = "\0/org/freedesktop/plymouthd", \ } -#ifndef TTY_GID -#define TTY_GID 5 -#endif - #define NOTIFY_FD_MAX 768 #define NOTIFY_BUFFER_MAX PIPE_BUF diff --git a/src/basic/missing.h b/src/basic/missing.h index 284cbaffc0..e860fa7c2c 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -68,8 +68,6 @@ struct sockaddr_vm { }; #endif /* !HAVE_LINUX_VM_SOCKETS_H */ -#include "macro.h" - #ifndef RLIMIT_RTTIME #define RLIMIT_RTTIME 15 #endif diff --git a/src/basic/random-util.c b/src/basic/random-util.c index ad7b3eedf2..b216be579d 100644 --- a/src/basic/random-util.c +++ b/src/basic/random-util.c @@ -27,7 +27,13 @@ #include <stdint.h> #ifdef HAVE_SYS_AUXV_H -#include <sys/auxv.h> +# include <sys/auxv.h> +#endif + +#ifdef USE_SYS_RANDOM_H +# include <sys/random.h> +#else +# include <linux/random.h> #endif #include "fd-util.h" |