From e2f227fbaa6ee9533bf86877975378b08bc87172 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Tue, 30 Jan 2007 15:09:30 +0000 Subject: [PATCH] Fix the logic bug that caused the custom versions of warn(3) and warnx(3) to be compiled on systems that have it (e.g. FreeBSD), while the intention was opposite, i.e., compile them on systems that don't have them. Also fixes static linkage of pkg_sign(1). --- usr.sbin/pkg_install/sign/main.c | 4 ++-- usr.sbin/pkg_install/sign/stand.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/pkg_install/sign/main.c b/usr.sbin/pkg_install/sign/main.c index c5068b77b1d..0161efe6c40 100644 --- a/usr.sbin/pkg_install/sign/main.c +++ b/usr.sbin/pkg_install/sign/main.c @@ -106,9 +106,9 @@ main(argc, argv, envp) int i; int type = TAG_ANY; -/* #ifndef BSD4_4 */ +#ifndef BSD4_4 set_program_name(argv[0]); -/* #endif */ +#endif #ifdef CHECKER_ONLY mode = CHECK; #else diff --git a/usr.sbin/pkg_install/sign/stand.c b/usr.sbin/pkg_install/sign/stand.c index 703c58db522..98e4b4753fa 100644 --- a/usr.sbin/pkg_install/sign/stand.c +++ b/usr.sbin/pkg_install/sign/stand.c @@ -3,7 +3,7 @@ __FBSDID("$FreeBSD$"); #include "stand.h" -#ifdef BSD4_4 +#ifndef BSD4_4 #include #include #include