Date: Mon, 18 Oct 1999 12:51:18 +0600 From: Konstantin Chuguev <joy@urc.ac.ru> To: freebsd-ports@freebsd.org Subject: Latest patch for devel/libgtop for current broken? Message-ID: <380AC366.52902E82@urc.ac.ru>
next in thread | raw e-mail | index | archive | help
Hi.
The latest patch (patch-ag) for libgtop to be compiled on the newest
CURRENT with signal changes seems to have an error:
--- sysdeps/freebsd/procsignal.c.orig Sat Oct 16 10:57:29 1999
+++ sysdeps/freebsd/procsignal.c Sat Oct 16 11:23:43 1999
@@ -26,6 +26,7 @@
#include <glibtop/procsignal.h>
#include <glibtop_suid.h>
+#include <osreldate.h>
static const unsigned long _glibtop_sysdeps_proc_signal =
(1L << GLIBTOP_PROC_SIGNAL_SIGNAL) +
@@ -66,7 +67,7 @@
/* signal: mask of pending signals.
* pinfo [0].kp_proc.p_siglist
*/
-#if defined(__NetBSD__) && (NSIG > 32)
+#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >=
400011)
buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0];
#else
buf->signal [0] = pinfo [0].kp_proc.p_siglist;
@@ -75,7 +76,7 @@
/* blocked: mask of blocked signals.
* pinfo [0].kp_proc.p_sigmask
*/
-#if defined(__NetBSD__) && (NSIG > 32)
+#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >=
400011)
buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0];
#else
buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
@@ -84,16 +85,16 @@
/* sigignore: mask of ignored signals.
* pinfo [0].kp_proc.p_sigignore
*/
-#if defined(__NetBSD__) && (NSIG > 32)
+#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >=
400011)
buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0];
#else
VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
- buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
+ buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0];
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This line should definitely not be patched:
buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
---------------------------------------------------------------------
#endif
/* sigcatch: mask of caught signals.
* pinfo [0].kp_proc.p_sigcatch
*/
-#if defined(__NetBSD__) && (NSIG > 32)
+#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >=
400011)
buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0];
#else
buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
(I am sorry for that not diff format, but the change is so small and the
diff of a patch file looks so weird :-)
--
Konstantin V. Chuguev. System administrator of Southern
http://www.urc.ac.ru/~joy/ Ural Regional Center of FREEnet,
mailto:joy@urc.ac.ru Chelyabinsk, Russia.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?380AC366.52902E82>