83c04ab4bc
+ Use sysutils as the category, since it's best-placed there + Bring over the patch from x11/xmeter to quieten the compilation. + Retain the installation into X11BASE from sysutils/xmeter (there's an application default file that has to be placed somewhere) + Retain the better description from sysutils/xmeter
24 lines
724 B
Text
24 lines
724 B
Text
$NetBSD: patch-aa,v 1.1 2001/10/23 11:38:31 agc Exp $
|
|
|
|
Use the right signal handler type.
|
|
|
|
--- xmeter.c 1998/10/30 10:41:09 1.1
|
|
+++ xmeter.c 1998/10/30 10:41:51
|
|
@@ -135,6 +135,8 @@
|
|
#define PORTMAP /* Get right function declarations on Solaris 2 */
|
|
#include <rpc/rpc.h>
|
|
#include <rpc/pmap_prot.h>
|
|
+#undef FSHIFT /* Use protocol's shift and scale values */
|
|
+#undef FSCALE
|
|
#include <rpcsvc/rstat.h>
|
|
/*
|
|
* We need the definitions of CP_USER, CP_NICE and CP_SYS. Some systems
|
|
@@ -231,7 +228,7 @@
|
|
char *name; /* Name of stat for menu widget */
|
|
} STATDATA;
|
|
|
|
-#if defined(SVR4) || defined(sgi)
|
|
+#if defined(SVR4) || defined(sgi) || (defined(BSD) && BSD >= 199306)
|
|
#define SIGTYPE void
|
|
#else
|
|
#define SIGTYPE int
|