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 2009-01-05 15:46:03 -08:00
parent fa6e8d307a 7220e797f9
commit 61203aa932
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/avl/Makefile.in
View File

@ -3,8 +3,8 @@ DISTFILES = avl.c
MODULE := zavl MODULE := zavl
EXTRA_CFLAGS = @KERNELCPPFLAGS@ EXTRA_CFLAGS = -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/avl/include EXTRA_CFLAGS += @KERNELCPPFLAGS@
obj-m := ${MODULE}.o obj-m := ${MODULE}.o

4
module/nvpair/Makefile.in
View File

@ -3,8 +3,8 @@ DISTFILES = nvpair.c
MODULE := znvpair MODULE := znvpair
EXTRA_CFLAGS = @KERNELCPPFLAGS@ EXTRA_CFLAGS = -I@MODDIR@/nvpair/include
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include EXTRA_CFLAGS += @KERNELCPPFLAGS@
obj-m := ${MODULE}.o obj-m := ${MODULE}.o

4
module/unicode/Makefile.in
View File

@ -3,8 +3,8 @@ DISTFILES = u8_textprep.c uconv.c
MODULE := zunicode MODULE := zunicode
EXTRA_CFLAGS = @KERNELCPPFLAGS@ EXTRA_CFLAGS = -I@MODDIR@/unicode/include
EXTRA_CFLAGS += -I@MODDIR@/unicode/include EXTRA_CFLAGS += @KERNELCPPFLAGS@
obj-m := ${MODULE}.o obj-m := ${MODULE}.o

2
module/unicode/u8_textprep.c
View File

@ -45,11 +45,11 @@
#include <sys/ddi.h> #include <sys/ddi.h>
#include <sys/sunddi.h> #include <sys/sunddi.h>
#else #else
#include <sys/u8_textprep.h>
#include <strings.h> #include <strings.h>
#endif /* _KERNEL */ #endif /* _KERNEL */
#include <sys/byteorder.h> #include <sys/byteorder.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/u8_textprep.h>
#include <sys/u8_textprep_data.h> #include <sys/u8_textprep_data.h>

3
module/unicode/uconv.c
View File

@ -42,10 +42,11 @@
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <sys/sunddi.h> #include <sys/sunddi.h>
#else
#include <sys/u8_textprep.h>
#endif /* _KERNEL */ #endif /* _KERNEL */
#include <sys/byteorder.h> #include <sys/byteorder.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/u8_textprep.h>
/* /*

4
module/zcommon/Makefile.in
View File

@ -4,12 +4,12 @@ DISTFILES += zfs_prop.c zpool_prop.c zprop_common.c
MODULE := zcommon MODULE := zcommon
EXTRA_CFLAGS = @KERNELCPPFLAGS@ EXTRA_CFLAGS = -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
EXTRA_CFLAGS += -I@MODDIR@/unicode/include EXTRA_CFLAGS += -I@MODDIR@/unicode/include
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
EXTRA_CFLAGS += -I@MODDIR@/zfs/include EXTRA_CFLAGS += -I@MODDIR@/zfs/include
EXTRA_CFLAGS += @KERNELCPPFLAGS@
obj-m := ${MODULE}.o obj-m := ${MODULE}.o

4
module/zfs/Makefile.in
View File

@ -11,12 +11,12 @@ DISTFILES += zfs_znode.o zil.o zio.o zio_checksum.o zio_compress.o zio_inject.o
MODULE := zpool MODULE := zpool
EXTRA_CFLAGS = @KERNELCPPFLAGS@ EXTRA_CFLAGS = -I@MODDIR@/zfs/include
EXTRA_CFLAGS += -I@MODDIR@/zfs/include
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
EXTRA_CFLAGS += -I@MODDIR@/avl/include EXTRA_CFLAGS += -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
EXTRA_CFLAGS += -I@MODDIR@/unicode/include EXTRA_CFLAGS += -I@MODDIR@/unicode/include
EXTRA_CFLAGS += @KERNELCPPFLAGS@
obj-m := ${MODULE}.o obj-m := ${MODULE}.o