[src/trunk]: src/sys/rump/librump/rumpuser Include link.h instead of the NetB...

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

details:   https://anonhg.NetBSD.org/src/rev/f0d83d15e934
branches:  trunk
changeset: 749260:f0d83d15e934
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Nov 23 14:39:35 2009 +0000

description:
Include link.h instead of the NetBSD-specific link_elf.h.  Use
dlinfo() only if __ELF__ is defined.

diffstat:

 sys/rump/librump/rumpuser/rumpuser_dl.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 18bfe66d1f5e -r f0d83d15e934 sys/rump/librump/rumpuser/rumpuser_dl.c
--- a/sys/rump/librump/rumpuser/rumpuser_dl.c   Mon Nov 23 14:07:45 2009 +0000
+++ b/sys/rump/librump/rumpuser/rumpuser_dl.c   Mon Nov 23 14:39:35 2009 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpuser_dl.c,v 1.5 2009/11/05 14:13:03 pooka Exp $   */
+/*      $NetBSD: rumpuser_dl.c,v 1.6 2009/11/23 14:39:35 pooka Exp $   */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -30,21 +30,21 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.5 2009/11/05 14:13:03 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.6 2009/11/23 14:39:35 pooka Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
 
 #include <assert.h>
 #include <dlfcn.h>
-#include <link_elf.h>
+#include <link.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <rump/rumpuser.h>
 
-#if defined(__NetBSD__) || defined(__FreeBSD__)                                \
-    || (defined(__sun__) && defined(__svr4__))
+#if defined(__ELF__) && (defined(__NetBSD__) || defined(__FreeBSD__)   \
+    || (defined(__sun__) && defined(__svr4__)))
 static int
 process(const char *soname, rump_modinit_fn domodinit)
 {