diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2011-10-06 23:27:05 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2011-10-06 23:27:05 +0000 |
commit | ca0ccae638c0fbadbdba0866ff9bdb40021354d1 (patch) | |
tree | e3444af3fe5a82e97537be155092925d7afe0147 /usr.bin | |
parent | 5780696ddebbc643c6f559e84c087d367ec6a4c6 (diff) |
just define UNITSFILE directly, and do away with the need for pathnames.h;
ok deraadt
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/units/pathnames.h | 34 | ||||
-rw-r--r-- | usr.bin/units/units.c | 8 |
2 files changed, 2 insertions, 40 deletions
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h deleted file mode 100644 index e7842d07928..00000000000 --- a/usr.bin/units/pathnames.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $OpenBSD: pathnames.h,v 1.3 1996/06/26 05:42:14 deraadt Exp $ */ -/* $NetBSD: pathnames.h,v 1.3 1996/04/06 06:01:00 thorpej Exp $ */ - -/* - * Copyright (c) 1993 Christopher G. Demetriou - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christopher G. Demetriou. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#define _PATH_UNITSLIB "/usr/share/misc/units.lib" diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c index 44b40b39e0f..e1d42908c4f 100644 --- a/usr.bin/units/units.c +++ b/usr.bin/units/units.c @@ -1,4 +1,4 @@ -/* $OpenBSD: units.c,v 1.15 2011/10/06 17:58:04 jmc Exp $ */ +/* $OpenBSD: units.c,v 1.16 2011/10/06 23:27:04 jmc Exp $ */ /* $NetBSD: units.c,v 1.6 1996/04/06 06:01:03 thorpej Exp $ */ /* @@ -23,14 +23,10 @@ #include <string.h> #include <stdlib.h> -#include "pathnames.h" +#define UNITSFILE "/usr/share/misc/units.lib" #define VERSION "1.0" -#ifndef UNITSFILE -#define UNITSFILE _PATH_UNITSLIB -#endif - #define MAXUNITS 1000 #define MAXPREFIXES 100 |