From owner-svn-src-projects@FreeBSD.ORG  Mon Mar 22 18:51:56 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C46B106564A;
	Mon, 22 Mar 2010 18:51:56 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4BDE88FC14;
	Mon, 22 Mar 2010 18:51:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2MIpuCb009377;
	Mon, 22 Mar 2010 18:51:56 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2MIput2009374;
	Mon, 22 Mar 2010 18:51:56 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201003221851.o2MIput2009374@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 22 Mar 2010 18:51:56 +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: r205457 - projects/altix/lib/libstand
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: Mon, 22 Mar 2010 18:51:56 -0000

Author: marcel
Date: Mon Mar 22 18:51:56 2010
New Revision: 205457
URL: http://svn.freebsd.org/changeset/base/205457

Log:
  Merge svn+ssh://svn.freebsd.org/base/head@205454

Modified:
  projects/altix/lib/libstand/bzipfs.c
  projects/altix/lib/libstand/gzipfs.c
Directory Properties:
  projects/altix/lib/libstand/   (props changed)

Modified: projects/altix/lib/libstand/bzipfs.c
==============================================================================
--- projects/altix/lib/libstand/bzipfs.c	Mon Mar 22 18:50:57 2010	(r205456)
+++ projects/altix/lib/libstand/bzipfs.c	Mon Mar 22 18:51:56 2010	(r205457)
@@ -81,14 +81,6 @@ struct fs_ops bzipfs_fsops = {
 };
 #endif
 
-#if 0
-void *
-calloc(int items, size_t size)
-{
-    return(malloc(items * size));
-}
-#endif
-
 static int
 bzf_fill(struct bz_file *bzf)
 {

Modified: projects/altix/lib/libstand/gzipfs.c
==============================================================================
--- projects/altix/lib/libstand/gzipfs.c	Mon Mar 22 18:50:57 2010	(r205456)
+++ projects/altix/lib/libstand/gzipfs.c	Mon Mar 22 18:51:56 2010	(r205457)
@@ -62,14 +62,6 @@ struct fs_ops gzipfs_fsops = {
     null_readdir
 };
 
-#if 0
-void *
-calloc(int items, size_t size)
-{
-    return(malloc(items * size));
-}
-#endif
-
 static int
 zf_fill(struct z_file *zf)
 {