diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog index 222a1f15..878c1f1b 100644 --- a/sysdeps/freebsd/ChangeLog +++ b/sysdeps/freebsd/ChangeLog @@ -1,11 +1,10 @@ 1999-02-21 Martin Baulig + * procmap.c, procmem.c: Applied patch from Jeremy Lea. + * prockernel.c, proctime.c: Applied patch from the FreeBSD 2.2.8 ports collection. - * procmap.c, procmem.c: Applied patch from Jeremy Lea; this - patch is also included in the FreeBSD-current ports collection. - * procsignal.c: Applied patch from the NetBSD-current ports collection. diff --git a/sysdeps/freebsd/procmap.c b/sysdeps/freebsd/procmap.c index ecdd9269..41bba26e 100644 --- a/sysdeps/freebsd/procmap.c +++ b/sysdeps/freebsd/procmap.c @@ -140,8 +140,13 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf, } #ifdef __FreeBSD__ - if (entry.eflags & MAP_ENTRY_IS_SUB_MAP) +#if __FreeBSD__ >= 4 + if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP)) continue; +#else + if (entry.eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP)) + continue; +#endif #else if (entry.is_a_map || entry.is_sub_map) continue; diff --git a/sysdeps/freebsd/procmem.c b/sysdeps/freebsd/procmem.c index 7bfb5a1b..70da3b7b 100644 --- a/sysdeps/freebsd/procmem.c +++ b/sysdeps/freebsd/procmem.c @@ -166,8 +166,14 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, } #ifdef __FreeBSD__ - if (entry.eflags & MAP_ENTRY_IS_SUB_MAP) +#ifdef __FreeBSD__ +#if __FreeBSD__ >= 4 + if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP)) continue; +#else + if (entry.eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP)) + continue; +#endif #else if (entry.is_a_map || entry.is_sub_map) continue;