diff options
| author | Benda Xu <heroxbd@gentoo.org> | 2015-11-11 13:37:41 -0600 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2015-11-11 13:37:41 -0600 |
| commit | 085d77f17e3bedd23ffa96fe7e4eb8515ae8bfc6 (patch) | |
| tree | 925aa6b93ce22bd614e74659e1211aaae1ca6850 /src | |
| parent | c831f1f994e187afd8edfff15e4063b99440bbcb (diff) | |
| download | openrc-085d77f17e3bedd23ffa96fe7e4eb8515ae8bfc6.tar.xz | |
Standardize macro tests for gnu hurd
This also fixes breakage of GNU/hurd builds introduced by commit 3f82edbeb92.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librc/librc-daemon.c | 3 | ||||
| -rw-r--r-- | src/rc/mountinfo.c | 8 | ||||
| -rw-r--r-- | src/rc/openrc-run.c | 4 | ||||
| -rw-r--r-- | src/rc/rc-logger.c | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c index 4986f70d..09b2ce30 100644 --- a/src/librc/librc-daemon.c +++ b/src/librc/librc-daemon.c @@ -31,7 +31,8 @@ #include "queue.h" #include "librc.h" -#if defined(__linux__) || (defined (__FreeBSD_kernel__) && defined(__GLIBC__)) +#if defined(__linux__) || (defined (__FreeBSD_kernel__) && defined(__GLIBC__)) \ + || defined(__GNU__) static bool pid_is_exec(pid_t pid, const char *exec) { diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c index 3f1dfb60..8951c5ad 100644 --- a/src/rc/mountinfo.c +++ b/src/rc/mountinfo.c @@ -39,8 +39,8 @@ # include <sys/statvfs.h> # define statfs statvfs # define F_FLAGS f_flag -#elif defined (__linux__) || (defined(__FreeBSD_kernel__) && \ - defined(__GLIBC__)) || defined(__GNU__) +#elif defined(__linux__) || (defined(__FreeBSD_kernel__) && \ + defined(__GLIBC__)) || defined(__GNU__) # include <mntent.h> #endif @@ -267,8 +267,8 @@ find_mounts(struct args *args) return list; } -#elif defined (__linux__) || (defined (__FreeBSD_kernel__) && \ - defined(__GLIBC__)) +#elif defined(__linux__) || (defined(__FreeBSD_kernel__) && \ + defined(__GLIBC__)) || defined(__GNU__) static struct mntent * getmntfile(const char *file) { diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c index f3a009e5..2af95ec4 100644 --- a/src/rc/openrc-run.c +++ b/src/rc/openrc-run.c @@ -51,8 +51,8 @@ #include <time.h> #include <unistd.h> -#if defined(__linux__) || (defined(__FreeBSD_kernel__) && \ - defined(__GLIBC__)) +#if defined(__linux__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) \ + || defined(__GNU__) # include <pty.h> #elif defined(__NetBSD__) || defined(__OpenBSD__) # include <util.h> diff --git a/src/rc/rc-logger.c b/src/rc/rc-logger.c index e72f1818..894912fd 100644 --- a/src/rc/rc-logger.c +++ b/src/rc/rc-logger.c @@ -44,7 +44,8 @@ #include <time.h> #include <unistd.h> -#if defined(__linux__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) +#if defined(__linux__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) \ + || defined(__GNU__) # include <pty.h> #elif defined(__NetBSD__) || defined(__OpenBSD__) # include <util.h> |