emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize macro tests for gnu hurd

Browse Source 
This also fixes breakage of GNU/hurd builds introduced by commit 3f82edbeb9.
This commit is contained in:
Benda Xu 2015-11-11 13:37:41 -06:00 committed by William Hubbs
parent c831f1f994
commit 085d77f17e
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librc/librc-daemon.c
View File

@ -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)
{

8
src/rc/mountinfo.c
View File

@ -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)
{

4
src/rc/openrc-run.c
View File

@ -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>

3
src/rc/rc-logger.c
View File

@ -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>