[src/trunk]: src/lib/librumpuser Attempt two for the previous: _ILP32 comes f...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1cb3d7f04f4
branches:  trunk
changeset: 785559:f1cb3d7f04f4
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Mar 20 12:59:10 2013 +0000

description:
Attempt two for the previous: _ILP32 comes from headers, so don't use
it to decide if we want to muddle with _FILE_OFFSET_BITS.

diffstat:

 lib/librumpuser/rumpuser_dl.c   |   9 ++++-----
 lib/librumpuser/rumpuser_port.h |  10 +++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r 7e0ca3f94b0c -r f1cb3d7f04f4 lib/librumpuser/rumpuser_dl.c
--- a/lib/librumpuser/rumpuser_dl.c     Wed Mar 20 12:30:13 2013 +0000
+++ b/lib/librumpuser/rumpuser_dl.c     Wed Mar 20 12:59:10 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $  */
+/*      $NetBSD: rumpuser_dl.c,v 1.17 2013/03/20 12:59:10 pooka Exp $  */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -34,14 +34,13 @@
  * Solaris libelf.h doesn't support _FILE_OFFSET_BITS=64.  Luckily,
  * for this module it doesn't matter.
  */
-#if defined(__sun__) && defined(_IPL32)
-#define _FILE_OFFSET_BITS 32
+#if defined(__sun__)
+#define RUMPUSER_NO_FILE_OFFSET_BITS
 #endif
-
 #include "rumpuser_port.h"
 
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.17 2013/03/20 12:59:10 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff -r 7e0ca3f94b0c -r f1cb3d7f04f4 lib/librumpuser/rumpuser_port.h
--- a/lib/librumpuser/rumpuser_port.h   Wed Mar 20 12:30:13 2013 +0000
+++ b/lib/librumpuser/rumpuser_port.h   Wed Mar 20 12:59:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser_port.h,v 1.15 2013/03/20 12:30:13 pooka Exp $ */
+/*     $NetBSD: rumpuser_port.h,v 1.16 2013/03/20 12:59:10 pooka Exp $ */
 
 /*
  * Portability header for non-NetBSD platforms.
@@ -46,8 +46,12 @@
 #include <features.h>
 #endif
 
-#if defined(__sun__) && !defined(_FILE_OFFSET_BITS)
-#define _FILE_OFFSET_BITS 64
+#if defined(__sun__)
+#  if defined(RUMPUSER_NO_FILE_OFFSET_BITS)
+#    undef _FILE_OFFSET_BITS
+#  else
+#    define _FILE_OFFSET_BITS 64
+#  endif
 #endif
 
 #include <sys/types.h>