aboutsummaryrefslogtreecommitdiff
path: root/src/rc
diff options
context:
space:
mode:
authorBenda Xu <heroxbd@gentoo.org>2015-11-11 13:37:41 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2015-11-11 13:37:41 -0600
commit085d77f17e3bedd23ffa96fe7e4eb8515ae8bfc6 (patch)
tree925aa6b93ce22bd614e74659e1211aaae1ca6850 /src/rc
parentc831f1f994e187afd8edfff15e4063b99440bbcb (diff)
Standardize macro tests for gnu hurd
This also fixes breakage of GNU/hurd builds introduced by commit 3f82edbeb92.
Diffstat (limited to 'src/rc')
-rw-r--r--src/rc/mountinfo.c8
-rw-r--r--src/rc/openrc-run.c4
-rw-r--r--src/rc/rc-logger.c3
3 files changed, 8 insertions, 7 deletions
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>