From a7b13c7d8342782f36a6aba9d914d21e7bc7d2fc Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Tue, 27 Feb 2001 13:40:10 +0000 Subject: [PATCH] Applied a patch from Rolf Grossmann (grossman@securitas.net) for FreeBSD 2001-02-27 Martin Baulig * shm_limits.c, msg_limits.c, sem_limits.c: Applied a patch from Rolf Grossmann (grossman@securitas.net) for FreeBSD 4.2. Fixes #51334. --- sysdeps/freebsd/ChangeLog | 6 ++++++ sysdeps/freebsd/msg_limits.c | 2 +- sysdeps/freebsd/sem_limits.c | 2 +- sysdeps/freebsd/shm_limits.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog index e8adcf7f..f5356dff 100644 --- a/sysdeps/freebsd/ChangeLog +++ b/sysdeps/freebsd/ChangeLog @@ -1,3 +1,9 @@ +2001-02-27 Martin Baulig + + * shm_limits.c, msg_limits.c, sem_limits.c: Applied a patch + from Rolf Grossmann (grossman@securitas.net) for FreeBSD 4.2. + Fixes #51334. + 2001-02-14 Martin Baulig * proctime.c (glibtop_get_proc_time_p): Make things work on diff --git a/sysdeps/freebsd/msg_limits.c b/sysdeps/freebsd/msg_limits.c index e5bf24aa..e4752bf3 100644 --- a/sysdeps/freebsd/msg_limits.c +++ b/sysdeps/freebsd/msg_limits.c @@ -46,7 +46,7 @@ glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf) /* #define KERNEL to get declaration of `struct msginfo'. */ -#if (defined __FreeBSD__) || (defined __bsdi__) +#if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || (defined __bsdi__) #define KERNEL 1 #else #define _KERNEL 1 diff --git a/sysdeps/freebsd/sem_limits.c b/sysdeps/freebsd/sem_limits.c index 262e5bc1..c9a177de 100644 --- a/sysdeps/freebsd/sem_limits.c +++ b/sysdeps/freebsd/sem_limits.c @@ -46,7 +46,7 @@ glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf) /* #define KERNEL to get declaration of `struct seminfo'. */ -#if defined(__FreeBSD__) || defined(__bsdi__) +#if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__) #define KERNEL 1 #else #define _KERNEL 1 diff --git a/sysdeps/freebsd/shm_limits.c b/sysdeps/freebsd/shm_limits.c index 280a53bd..5abe88e8 100644 --- a/sysdeps/freebsd/shm_limits.c +++ b/sysdeps/freebsd/shm_limits.c @@ -46,7 +46,7 @@ glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf) /* #define KERNEL to get declaration of `struct shminfo'. */ -#if defined(__FreeBSD__) || defined(__bsdi__) +#if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__) #define KERNEL 1 #else #define _KERNEL 1