Deleted Added
full compact
conf.c (329145) conf.c (344377)
1/*-
2 * Copyright (c) 1997
3 * Matthias Drochner. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 18 unchanged lines hidden (view full) ---

27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 *
31 * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
32 */
33
34#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1997
3 * Matthias Drochner. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 18 unchanged lines hidden (view full) ---

27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 *
31 * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
32 */
33
34#include <sys/cdefs.h>
35__FBSDID("$FreeBSD: stable/11/stand/userboot/userboot/conf.c 283939 2015-06-03 10:10:00Z avg $");
35__FBSDID("$FreeBSD: stable/11/stand/userboot/userboot/conf.c 344377 2019-02-20 19:13:09Z kevans $");
36
37#include <stand.h>
38
39#include "libuserboot.h"
40
41#if defined(USERBOOT_ZFS_SUPPORT)
36
37#include <stand.h>
38
39#include "libuserboot.h"
40
41#if defined(USERBOOT_ZFS_SUPPORT)
42#include "../zfs/libzfs.h"
42#include "libzfs.h"
43#endif
44
45/*
46 * We could use linker sets for some or all of these, but
47 * then we would have to control what ended up linked into
48 * the bootstrap. So it's easier to conditionalise things
49 * here.
50 *

--- 57 unchanged lines hidden ---
43#endif
44
45/*
46 * We could use linker sets for some or all of these, but
47 * then we would have to control what ended up linked into
48 * the bootstrap. So it's easier to conditionalise things
49 * here.
50 *

--- 57 unchanged lines hidden ---