svn commit: r205457 - projects/altix/lib/libstand

[Marcel Moolenaar]

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)
 {