summaryrefslogtreecommitdiffstats
path: root/usr.bin/units
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2016-04-19 05:04:39 +0000
committereadler <eadler@FreeBSD.org>2016-04-19 05:04:39 +0000
commit5ebf5daae9fbf0c5ae4eb758e73598122b76ec40 (patch)
tree63e8de6e4e76f1694bf1fddd1c80821c20b23051 /usr.bin/units
parentd6cc304ba6d23235c0aaebe0b2e6bbf49f5ea7d4 (diff)
downloadFreeBSD-src-5ebf5daae9fbf0c5ae4eb758e73598122b76ec40.zip
FreeBSD-src-5ebf5daae9fbf0c5ae4eb758e73598122b76ec40.tar.gz
Remove pathnames.h
- it only holds a single constant - it doesn't exist in the GNU variant
Diffstat (limited to 'usr.bin/units')
-rw-r--r--usr.bin/units/pathnames.h33
-rw-r--r--usr.bin/units/units.c2
2 files changed, 1 insertions, 34 deletions
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h
deleted file mode 100644
index 227dd00..0000000
--- a/usr.bin/units/pathnames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $FreeBSD$ */
-
-/*
- * 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 94495c9..7e29bef 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -33,7 +33,7 @@ static const char rcsid[] =
#include <sys/capsicum.h>
-#include "pathnames.h"
+#define _PATH_UNITSLIB "/usr/share/misc/units.lib"
#ifndef UNITSFILE
#define UNITSFILE _PATH_UNITSLIB
OpenPOWER on IntegriCloud