aboutsummaryrefslogtreecommitdiffstats
path: root/dir.c
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2012-06-25 22:20:51 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2012-06-25 22:20:51 +0000
commit0fae4a3feb6507525100ba80841fb42e993656b0 (patch)
tree5bd1563c152e800aa8f10e98ac0713d41c302eb5 /dir.c
parentb379932fc0f836f9f3f5ac89ef7f6cd38377dff8 (diff)
downloadsrc-0fae4a3feb6507525100ba80841fb42e993656b0.tar.gz
src-0fae4a3feb6507525100ba80841fb42e993656b0.zip
Import the 20-June-2012 release of the "Portable" BSD make tool (from NetBSD).vendor/NetBSD/bmake/20120620
Submitted by: sjg@juniper.net
Notes
Notes: svn path=/vendor/NetBSD/bmake/dist/; revision=237578 svn path=/vendor/NetBSD/bmake/20120620/; revision=237580; tag=vendor/NetBSD/bmake/20120620
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/dir.c b/dir.c
index 6560f30d05bd..1c56ea3e8973 100644
--- a/dir.c
+++ b/dir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.64 2012/04/07 18:29:08 christos Exp $ */
+/* $NetBSD: dir.c,v 1.65 2012/06/12 19:21:50 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.64 2012/04/07 18:29:08 christos Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.65 2012/06/12 19:21:50 joerg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: dir.c,v 1.64 2012/04/07 18:29:08 christos Exp $");
+__RCSID("$NetBSD: dir.c,v 1.65 2012/06/12 19:21:50 joerg Exp $");
#endif
#endif /* not lint */
#endif
@@ -860,8 +860,8 @@ Dir_Expand(const char *word, Lst path, Lst expansions)
*-----------------------------------------------------------------------
*/
static char *
-DirLookup(Path *p, const char *name __unused, const char *cp,
- Boolean hasSlash __unused)
+DirLookup(Path *p, const char *name MAKE_ATTR_UNUSED, const char *cp,
+ Boolean hasSlash MAKE_ATTR_UNUSED)
{
char *file; /* the current filename to check */
@@ -1004,7 +1004,7 @@ DirLookupAbs(Path *p, const char *name, const char *cp)
*-----------------------------------------------------------------------
*/
static char *
-DirFindDot(Boolean hasSlash __unused, const char *name, const char *cp)
+DirFindDot(Boolean hasSlash MAKE_ATTR_UNUSED, const char *name, const char *cp)
{
if (Hash_FindEntry(&dot->files, cp) != NULL) {