diff options
Diffstat (limited to 'sys/compat/linux/linux_file.c')
| -rw-r--r-- | sys/compat/linux/linux_file.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index dbbf885..bd81cab 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -56,12 +56,12 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#if !COMPAT_LINUX32 -#include <machine/../linux/linux.h> -#include <machine/../linux/linux_proto.h> -#else +#ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> #include <machine/../linux32/linux32_proto.h> +#else +#include <machine/../linux/linux.h> +#include <machine/../linux/linux_proto.h> #endif #include <compat/linux/linux_util.h> @@ -833,7 +833,7 @@ struct l_flock { l_off_t l_len; l_pid_t l_pid; } -#if __amd64__ && COMPAT_LINUX32 +#if defined(__amd64__) && defined(COMPAT_LINUX32) __packed #endif ; @@ -881,7 +881,7 @@ bsd_to_linux_flock(struct flock *bsd_flock, struct l_flock *linux_flock) linux_flock->l_pid = (l_pid_t)bsd_flock->l_pid; } -#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) struct l_flock64 { l_short l_type; l_short l_whence; @@ -889,7 +889,7 @@ struct l_flock64 { l_loff_t l_len; l_pid_t l_pid; } -#if __amd64__ && COMPAT_LINUX32 +#if defined(__amd64__) && defined(COMPAT_LINUX32) __packed #endif ; @@ -1064,7 +1064,7 @@ linux_fcntl(struct thread *td, struct linux_fcntl_args *args) return (fcntl_common(td, &args64)); } -#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) int linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args) { |
