summaryrefslogtreecommitdiffstats
path: root/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
diff options
context:
space:
mode:
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c')
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
index ca35e77..f4eadbc 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
@@ -40,6 +40,7 @@
#include <alloca.h>
#else
#include <sys/sysctl.h>
+#include <libproc_compat.h>
#endif
#include <assert.h>
#include <libgen.h>
@@ -963,13 +964,8 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_t pid,
dt_proc_lock(dtp, P);
-#if defined(sun)
if (Plookup_by_addr(P, addr, name, sizeof (name), &sym) == 0) {
(void) Pobjname(P, addr, objname, sizeof (objname));
-#else
- if (proc_addr2sym(P, addr, name, sizeof (name), &sym) == 0) {
- (void) proc_objname(P, addr, objname, sizeof (objname));
-#endif
obj = dt_basename(objname);
@@ -979,11 +975,7 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_t pid,
} else {
(void) snprintf(c, sizeof (c), "%s`%s", obj, name);
}
-#if defined(sun)
} else if (Pobjname(P, addr, objname, sizeof (objname)) != 0) {
-#else
- } else if (proc_objname(P, addr, objname, sizeof (objname)) != 0) {
-#endif
(void) snprintf(c, sizeof (c), "%s`0x%llx",
dt_basename(objname), addr);
} else {
OpenPOWER on IntegriCloud