From 98e2482a94352fb526a94972423b2c3dc3ebae6f Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 14 Jan 2005 04:44:56 +0000 Subject: Match the LINUX32's style with existing style Submitted by: Jung-uk Kim Use positive, not negative logic. --- sys/compat/linux/linux_misc.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'sys/compat/linux/linux_misc.c') diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 6668841..0921907 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -74,12 +74,12 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#if !COMPAT_LINUX32 -#include -#include -#else +#ifdef COMPAT_LINUX32 #include #include +#else +#include +#include #endif #include @@ -777,7 +777,7 @@ linux_newuname(struct thread *td, struct linux_newuname_args *args) return (copyout(&utsname, args->buf, sizeof(utsname))); } -#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) struct l_utimbuf { l_time_t l_actime; l_time_t l_modtime; @@ -1205,20 +1205,20 @@ linux_old_getrlimit(struct thread *td, struct linux_old_getrlimit_args *args) lim_rlimit(p, which, &bsd_rlim); PROC_UNLOCK(p); -#if !COMPAT_LINUX32 - rlim.rlim_cur = (unsigned long)bsd_rlim.rlim_cur; - if (rlim.rlim_cur == ULONG_MAX) - rlim.rlim_cur = LONG_MAX; - rlim.rlim_max = (unsigned long)bsd_rlim.rlim_max; - if (rlim.rlim_max == ULONG_MAX) - rlim.rlim_max = LONG_MAX; -#else +#ifdef COMPAT_LINUX32 rlim.rlim_cur = (unsigned int)bsd_rlim.rlim_cur; if (rlim.rlim_cur == UINT_MAX) rlim.rlim_cur = INT_MAX; rlim.rlim_max = (unsigned int)bsd_rlim.rlim_max; if (rlim.rlim_max == UINT_MAX) rlim.rlim_max = INT_MAX; +#else + rlim.rlim_cur = (unsigned long)bsd_rlim.rlim_cur; + if (rlim.rlim_cur == ULONG_MAX) + rlim.rlim_cur = LONG_MAX; + rlim.rlim_max = (unsigned long)bsd_rlim.rlim_max; + if (rlim.rlim_max == ULONG_MAX) + rlim.rlim_max = LONG_MAX; #endif return (copyout(&rlim, args->rlim, sizeof(rlim))); } -- cgit v1.1