Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2008-12-22 10:37:51 -08:00
parent b68bbdcf32 211effd3cd
commit ebdd4dacfa
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/libspl/include/stdio.h Normal file
View File

@ -0,0 +1,34 @@
/*
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
* Common Development and Distribution License, Version 1.0 only
* (the "License"). You may not use this file except in compliance
* with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
* See the License for the specific language governing permissions
* and limitations under the License.
*
* When distributing Covered Code, include this CDDL HEADER in each
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
* If applicable, add the following below this CDDL HEADER, with the
* fields enclosed by brackets "[]" replaced with your own identifying
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*/
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#include_next <stdio.h>
#ifndef _LIBSPL_STDIO_H
#define _LIBSPL_STDIO_H
#define enable_extended_FILE_stdio(fd, sig) ((void) 0)
#endif

1
lib/libzpool/Makefile.am
View File

@ -59,6 +59,7 @@ libzpool_la_SOURCES = \
${top_srcdir}/module/zfs/spa_history.c \
${top_srcdir}/module/zfs/zfs_fm.c \
${top_srcdir}/module/zfs/zfs_byteswap.c \
${top_srcdir}/module/zfs/zfs_fuid.c \
${top_srcdir}/module/zfs/zio.c \
${top_srcdir}/module/zfs/zio_checksum.c \
${top_srcdir}/module/zfs/fletcher.c \

2
module/zfs/Makefile.in
View File

@ -60,6 +60,8 @@ ${MODULE}-objs += spa_errlog.o # Log of persistent pool-wide data errors
${MODULE}-objs += spa_history.o # Command history support
${MODULE}-objs += spa_boot.o # Bootable root partitions
${MODULE}-objs += zfs_fm.o # Post reports of FMA consumption support
${MODULE}-objs += zfs_byteswap.c # XXX: ?
${MODULE}-objs += zfs_fuid.c # XXX: ?
# ZIO (ZFS I/O Pipeline)
${MODULE}-objs += zio.o # Interfaces zio core