diff options
author | joerg <joerg> | 2005-12-06 13:27:01 +0000 |
---|---|---|
committer | joerg <joerg> | 2005-12-06 13:27:01 +0000 |
commit | 302edc5f9099e40870e3649aa27f7d758822cacb (patch) | |
tree | 66f148cd7891cbba611a3e15c0b1645f3f411a80 /sysutils/skill/patches | |
parent | 668ef6a735edc7f915dd753147445cbab69d2b51 (diff) | |
download | pkgsrc-302edc5f9099e40870e3649aa27f7d758822cacb.tar.gz |
Fix errno. On DragonFly, define HAS_STRERROR to avoid conflicts with
system headers.
Diffstat (limited to 'sysutils/skill/patches')
-rw-r--r-- | sysutils/skill/patches/patch-ab | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/sysutils/skill/patches/patch-ab b/sysutils/skill/patches/patch-ab index 92cfe1b843a..4ad1841e4cb 100644 --- a/sysutils/skill/patches/patch-ab +++ b/sysutils/skill/patches/patch-ab @@ -1,23 +1,22 @@ -$NetBSD: patch-ab,v 1.11 2003/09/23 13:58:37 wiz Exp $ +$NetBSD: patch-ab,v 1.12 2005/12/06 13:27:01 joerg Exp $ ---- main.c.orig Sat Apr 6 05:26:01 2002 -+++ main.c Tue Sep 23 10:53:01 2003 -@@ -46,7 +46,14 @@ +--- main.c.orig 2003-08-19 00:36:08.000000000 +0000 ++++ main.c +@@ -46,6 +46,13 @@ const char *CopyrightVersion = "%s %s\n\ #include <stdio.h> #include <errno.h> #include <pwd.h> +#ifdef __NetBSD__ +#include <sys/sysctl.h> +#endif - ++ +#ifndef KI_MAXCOMLEN /* Pre NetBSD/1.5. Missing on !NetBSD */ +#define KI_MAXCOMLEN 24 +#endif -+ + /* * Processes which could not be checked -- usually due to permission - * problems (SunOS 4.1, SysVR4) -- are tallied in "MissedProcCnt". -@@ -137,7 +144,7 @@ +@@ -137,7 +144,7 @@ main(argc, argv) for (i = 0; i < CmdIndx; i++) { cmdp = (CmdList + i); if ((cmdp->flags & CMD_FLAG_EXACT) != 0 && @@ -26,3 +25,12 @@ $NetBSD: patch-ab,v 1.11 2003/09/23 13:58:37 wiz Exp $ break; else if ((cmdp->flags & CMD_FLAG_REGEX) != 0 && RegexMatch(CMD, cmdp) != 0) +@@ -330,8 +337,6 @@ Usage(error) + char * + SysErr() + { +- extern int errno; +- + #if defined(HAS_STRERROR) || defined(_LP64) + char *se = strerror(errno); + return((se==NULL)? "unknown error": se); |