From c9aaaff23b07a7bb3f03cff8e667ea1241eeeafe Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Mar 2010 16:48:16 -0700 Subject: [PATCH] Move zfs_config.h include to command line -include Remove the few places in the code where zfs_config.h is included. It is now added to the gcc compile line to ensure the config results are always available. --- module/avl/avl.c | 1 - module/nvpair/nvpair.c | 1 - module/unicode/u8_textprep.c | 1 - module/zcommon/zfs_prop.c | 1 - 4 files changed, 4 deletions(-) diff --git a/module/avl/avl.c b/module/avl/avl.c index eb8bfcd052..cdcf2afa61 100644 --- a/module/avl/avl.c +++ b/module/avl/avl.c @@ -1033,7 +1033,6 @@ done: } #if defined(_KERNEL) && defined(HAVE_SPL) -#include "zfs_config.h" static int avl_init(void) { return 0; } static int avl_fini(void) { return 0; } diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index 02abfdbefb..3492f23518 100644 --- a/module/nvpair/nvpair.c +++ b/module/nvpair/nvpair.c @@ -3246,7 +3246,6 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen) } #if defined(_KERNEL) && defined(HAVE_SPL) -#include "zfs_config.h" static int nvpair_init(void) { return 0; } static int nvpair_fini(void) { return 0; } diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c index 9f90e5056d..df6dcf552b 100644 --- a/module/unicode/u8_textprep.c +++ b/module/unicode/u8_textprep.c @@ -2133,7 +2133,6 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen, } #if defined(_KERNEL) && defined(HAVE_SPL) -#include "zfs_config.h" static int unicode_init(void) { return 0; } static int unicode_fini(void) { return 0; } diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index ec93ae4c99..bb73e7ee35 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -534,7 +534,6 @@ zfs_prop_align_right(zfs_prop_t prop) #endif #if defined(_KERNEL) && defined(HAVE_SPL) -#include "zfs_config.h" static int zcommon_init(void) { return 0; } static int zcommon_fini(void) { return 0; }