From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXAcu-0001rK-4m for qemu-devel@nongnu.org; Tue, 30 Apr 2013 09:29:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXAcm-00074U-18 for qemu-devel@nongnu.org; Tue, 30 Apr 2013 09:29:47 -0400 Received: from [216.171.111.232] (port=18739 helo=freebsd.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXAcl-00074H-QN for qemu-devel@nongnu.org; Tue, 30 Apr 2013 09:29:39 -0400 From: Ed Maste Date: Tue, 30 Apr 2013 09:29:32 -0400 Message-Id: <1367328572-40615-1-git-send-email-emaste@freebsd.org> Subject: [Qemu-devel] [PATCH v2] bsd-user: OS-agnostic 64-bit SYSCTL types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Ed Maste Use existence of type as #ifdef condition rather than FreeBSD-specific version check, as suggested by Patrick Welche. Also handle the signed (CTLTYPE_S64) case identically to the unsigned (CTLTYPE_U64) case, per later patches in the FreeBSD ports tree (emulators/qemu-devel/files/patch-z-arm-bsd-user-001). Signed-off-by: Ed Maste --- v2: Delete stray : at end of #ifdef conditional bsd-user/syscall.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index 69e3466..a4d1583 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -211,10 +211,11 @@ static int sysctl_oldcvt(void *holdp, size_t holdlen, uint32_t kind) *(uint64_t *)holdp = tswap64(*(unsigned long *)holdp); break; #endif -#if !defined(__FreeBSD_version) || __FreeBSD_version < 900031 - case CTLTYPE_QUAD: -#else +#ifdef CTLTYPE_U64 + case CTLTYPE_S64: case CTLTYPE_U64: +#else + case CTLTYPE_QUAD: #endif *(uint64_t *)holdp = tswap64(*(uint64_t *)holdp); break; -- 1.7.11.5