diff options
| author | Eric Koegel <eric.koegel@gmail.com> | 2017-06-20 10:17:15 +0300 |
|---|---|---|
| committer | Eric Koegel <eric.koegel@gmail.com> | 2017-06-20 20:02:11 +0300 |
| commit | 32e307560f48f8c41e53f7a88569d66c0f0b18c6 (patch) | |
| tree | 59fce39b97a88edd882ea3d48f158b200970354e | |
| parent | 61391aa1f8eb0c9550672868b893549d8c094364 (diff) | |
| download | ConsoleKit2-32e307560f48f8c41e53f7a88569d66c0f0b18c6.tar.gz | |
fix: fix compiling on FreeBSD
And remove -Wredundant-decls from build warnings
| -rw-r--r-- | m4/xdt-features.m4 | 2 | ||||
| -rw-r--r-- | src/ck-run-programs.c | 2 | ||||
| -rw-r--r-- | src/ck-sysdeps-unix.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/m4/xdt-features.m4 b/m4/xdt-features.m4 index 75f82a4..714ec75 100644 --- a/m4/xdt-features.m4 +++ b/m4/xdt-features.m4 @@ -85,7 +85,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]), dnl # signal.h inline is crapy on openbsd if test x`uname` != x"OpenBSD"; then - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls" + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS" fi if test x"$enable_debug" = x"full"; then diff --git a/src/ck-run-programs.c b/src/ck-run-programs.c index 3a00a57..8f14388 100644 --- a/src/ck-run-programs.c +++ b/src/ck-run-programs.c @@ -39,6 +39,8 @@ /* The number of wall-clock seconds a program is allowed to run before we kill it */ #define TIMEOUT_SECONDS 15 +/* Guaranteed by POSIX; see 'man environ' for details */ +extern char **environ; typedef struct { int refcount; diff --git a/src/ck-sysdeps-unix.c b/src/ck-sysdeps-unix.c index 0d2babf..64ed399 100644 --- a/src/ck-sysdeps-unix.c +++ b/src/ck-sysdeps-unix.c @@ -75,8 +75,8 @@ ck_get_socket_peer_credentials (int socket_fd, GError **error) { gboolean ret; - uid_t uid_read; - pid_t pid_read; + uid_t uid_read = 0; + pid_t pid_read = 0; #ifdef SO_PEERCRED #ifndef __OpenBSD__ |