Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
c5b1ce38ff
|
@ -6,7 +6,6 @@ AM_CFLAGS += -Wno-unknown-pragmas -Wno-parentheses
|
|||
AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
|
||||
|
||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||
AM_CFLAGS += -D_GNU_SOURCE -D__EXTENSIONS__
|
||||
AM_CFLAGS += -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT
|
||||
AM_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64
|
||||
AM_CFLAGS += -D_LARGEFILE64_SOURCE -D_REENTRANT
|
||||
AM_CFLAGS += -DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
|
||||
AM_CFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
|
||||
|
|
|
@ -5,6 +5,7 @@ DEFAULT_INCLUDES = \
|
|||
-I${top_srcdir}/lib/libspl/include \
|
||||
-I${top_srcdir}/lib/libnvpair/include \
|
||||
-I${top_srcdir}/module/nvpair/include \
|
||||
-I${top_srcdir}/module/avl/include \
|
||||
-I${top_srcdir}/module/zfs/include
|
||||
|
||||
lib_LTLIBRARIES = libzcommon.la
|
||||
|
|
Loading…
Reference in New Issue