From owner-svn-src-projects@FreeBSD.ORG  Tue Sep 18 16:23:23 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E4338106566B;
	Tue, 18 Sep 2012 16:23:23 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF4D28FC12;
	Tue, 18 Sep 2012 16:23:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8IGNNVK023968;
	Tue, 18 Sep 2012 16:23:23 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8IGNNbK023964;
	Tue, 18 Sep 2012 16:23:23 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201209181623.q8IGNNbK023964@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 18 Sep 2012 16:23:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240658 - in projects/mtree: include lib/libc/gen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Sep 2012 16:23:24 -0000

Author: brooks
Date: Tue Sep 18 16:23:23 2012
New Revision: 240658
URL: http://svn.freebsd.org/changeset/base/240658

Log:
  Work around the lack of some NetBSD macros from sys/cdefs.h.

Modified:
  projects/mtree/include/vis.h
  projects/mtree/lib/libc/gen/unvis.c
  projects/mtree/lib/libc/gen/vis.c

Modified: projects/mtree/include/vis.h
==============================================================================
--- projects/mtree/include/vis.h	Tue Sep 18 16:01:25 2012	(r240657)
+++ projects/mtree/include/vis.h	Tue Sep 18 16:23:23 2012	(r240658)
@@ -105,7 +105,7 @@ int	strunvisx(char *, const char *, int)
 int	strnunvisx(char *, size_t, const char *, int);
 
 #ifndef __LIBC12_SOURCE__
-int	unvis(char *, int, int *, int) __RENAME(__unvis50);
+int	unvis(char *, int, int *, int);
 #endif
 __END_DECLS
 

Modified: projects/mtree/lib/libc/gen/unvis.c
==============================================================================
--- projects/mtree/lib/libc/gen/unvis.c	Tue Sep 18 16:01:25 2012	(r240657)
+++ projects/mtree/lib/libc/gen/unvis.c	Tue Sep 18 16:23:23 2012	(r240658)
@@ -48,6 +48,14 @@ __RCSID("$NetBSD: unvis.c,v 1.39 2012/03
 #include <errno.h>
 #include <vis.h>
 
+#define	_DIAGASSERT(x)	assert(x)
+
+/*
+ * Return the number of elements in a statically-allocated array,
+ * __x.
+ */
+#define	__arraycount(__x)	(sizeof(__x) / sizeof(__x[0]))
+
 #ifdef __weak_alias
 __weak_alias(strnunvisx,_strnunvisx)
 #endif

Modified: projects/mtree/lib/libc/gen/vis.c
==============================================================================
--- projects/mtree/lib/libc/gen/vis.c	Tue Sep 18 16:01:25 2012	(r240657)
+++ projects/mtree/lib/libc/gen/vis.c	Tue Sep 18 16:23:23 2012	(r240658)
@@ -78,6 +78,8 @@ __weak_alias(strvisx,_strvisx)
 #include <stdio.h>
 #include <string.h>
 
+#define _DIAGASSERT(x)  assert(x)
+
 static char *do_svis(char *, size_t *, int, int, int, const char *);
 
 #undef BELL