Module Name: src
Committed By: pooka
Date: Wed Mar 20 12:30:13 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser_dl.c rumpuser_port.h
Log Message:
Use _FILE_OFFSET_BITS=64 on Solaris too (necessary for 32bit builds).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/librumpuser/rumpuser_dl.c
cvs rdiff -u -r1.14 -r1.15 src/lib/librumpuser/rumpuser_port.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.15 src/lib/librumpuser/rumpuser_dl.c:1.16
--- src/lib/librumpuser/rumpuser_dl.c:1.15 Tue Mar 12 14:03:32 2013
+++ src/lib/librumpuser/rumpuser_dl.c Wed Mar 20 12:30:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_dl.c,v 1.15 2013/03/12 14:03:32 pooka Exp $ */
+/* $NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -30,10 +30,18 @@
* Called during rump bootstrap.
*/
+/*
+ * 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
+#endif
+
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.15 2013/03/12 14:03:32 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.14 src/lib/librumpuser/rumpuser_port.h:1.15
--- src/lib/librumpuser/rumpuser_port.h:1.14 Thu Mar 14 21:31:35 2013
+++ src/lib/librumpuser/rumpuser_port.h Wed Mar 20 12:30:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_port.h,v 1.14 2013/03/14 21:31:35 pooka Exp $ */
+/* $NetBSD: rumpuser_port.h,v 1.15 2013/03/20 12:30:13 pooka Exp $ */
/*
* Portability header for non-NetBSD platforms.
@@ -46,6 +46,10 @@
#include <features.h>
#endif
+#if defined(__sun__) && !defined(_FILE_OFFSET_BITS)
+#define _FILE_OFFSET_BITS 64
+#endif
+
#include <sys/types.h>
#include <sys/param.h>
