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

fix defines for GNU/Hurd

Browse Source
This commit is contained in:
Svante Signell 2014-10-22 14:59:01 -05:00 committed by William Hubbs
parent 203b754f84
commit 875f03e27c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librc/librc.h
View File

@ -57,11 +57,13 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#ifdef BSD #if defined(BSD) && !defined(__GNU__)
#include <sys/param.h> #include <sys/param.h>
#include <sys/user.h> #include <sys/user.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <kvm.h> #include <kvm.h>
#else
#include <sys/param.h>
#endif #endif
#include "rc.h" #include "rc.h"

6
src/rc/mountinfo.c
View File

@ -35,11 +35,11 @@
# include <sys/ucred.h> # include <sys/ucred.h>
# include <sys/mount.h> # include <sys/mount.h>
# define F_FLAGS f_flags # define F_FLAGS f_flags
#elif defined(BSD) #elif defined(BSD) && !defined(__GNU__)
# include <sys/statvfs.h> # include <sys/statvfs.h>
# define statfs statvfs # define statfs statvfs
# define F_FLAGS f_flag # define F_FLAGS f_flag
#elif defined (__linux__) || defined (__FreeBSD_kernel__) #elif defined (__linux__) || defined (__FreeBSD_kernel__) || defined(__GNU__)
# include <mntent.h> # include <mntent.h>
#endif #endif
@ -168,7 +168,7 @@ process_mount(RC_STRINGLIST *list, struct args *args,
return -1; return -1;
} }
#ifdef BSD #if defined(BSD) && !defined(__GNU__)
/* Translate the mounted options to english /* Translate the mounted options to english
* This is taken directly from FreeBSD mount.c */ * This is taken directly from FreeBSD mount.c */