diff options
| author | Svante Signell <svante.signell@gmail.com> | 2014-10-21 01:53:37 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2014-10-22 11:05:07 -0500 |
| commit | 3f82edbeb9251149c6aff071d6537379af4e5eea (patch) | |
| tree | 6e023ef2b6a1506011b38c81cba29a824d0f543d | |
| parent | 86e9aa0d36813e2630c6613cd71c3ce8db642f71 (diff) | |
Fix GNU/kFreeBSD port
Check for __FreeBSD_kernel instead of __GLIBC__ in source files.
note from William Hubbs:
I was told this is a better check for GNU/kFreeBSD than checking the
C library the source is being compiled against.
GNU/kFreeBSD than checking which library we are using.
| -rw-r--r-- | src/librc/librc-daemon.c | 2 | ||||
| -rw-r--r-- | src/rc/mountinfo.c | 4 | ||||
| -rw-r--r-- | src/rc/rc-logger.c | 2 | ||||
| -rw-r--r-- | src/rc/runscript.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c index 04f25b1c..99703155 100644 --- a/src/librc/librc-daemon.c +++ b/src/librc/librc-daemon.c @@ -30,7 +30,7 @@ #include "librc.h" -#if defined(__linux__) || defined (__GLIBC__) +#if defined(__linux__) || defined (__FreeBSD_kernel__) static bool pid_is_exec(pid_t pid, const char *exec) { diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c index ce3f27dd..78409875 100644 --- a/src/rc/mountinfo.c +++ b/src/rc/mountinfo.c @@ -39,7 +39,7 @@ # include <sys/statvfs.h> # define statfs statvfs # define F_FLAGS f_flag -#elif defined (__linux__) || defined (__GLIBC__) +#elif defined (__linux__) || defined (__FreeBSD_kernel__) # include <mntent.h> #endif @@ -265,7 +265,7 @@ find_mounts(struct args *args) return list; } -#elif defined (__linux__) || defined (__GLIBC__) +#elif defined (__linux__) || defined (__FreeBSD_kernel__) static struct mntent * getmntfile(const char *file) { diff --git a/src/rc/rc-logger.c b/src/rc/rc-logger.c index e8fb0ff7..50cf6187 100644 --- a/src/rc/rc-logger.c +++ b/src/rc/rc-logger.c @@ -44,7 +44,7 @@ #include <time.h> #include <unistd.h> -#if defined(__linux__) || defined(__GLIBC__) +#if defined(__linux__) || defined(__FreeBSD_kernel__) # include <pty.h> #elif defined(__NetBSD__) || defined(__OpenBSD__) # include <util.h> diff --git a/src/rc/runscript.c b/src/rc/runscript.c index de18f90a..96aa683d 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -51,7 +51,7 @@ #include <time.h> #include <unistd.h> -#if defined(__linux__) || defined(__GLIBC__) +#if defined(__linux__) || defined(__FreeBSD_kernel__) # include <pty.h> #elif defined(__NetBSD__) || defined(__OpenBSD__) # include <util.h> |