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

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2010-03-26 15:48:57 -07:00
parent 97e5665aa7 23ab272555
commit a5ac944c72
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/Rules.am
View File

@ -1,9 +1,7 @@
DEFAULT_INCLUDES = -include ${top_srcdir}/zfs_config.h DEFAULT_INCLUDES = -include ${top_srcdir}/zfs_config.h
# FIXME: Add -Wshadow once everything is working AM_LIBTOOLFLAGS = --silent
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror
# Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS += -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT AM_CFLAGS += -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT
AM_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 AM_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64
AM_CFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" AM_CFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"

1
configure.ac
View File

@ -36,6 +36,7 @@ ZFS_AC_META
AC_CONFIG_AUX_DIR([config]) AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_SILENT_RULES
AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION]) AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION])
AC_CONFIG_HEADERS([zfs_config.h], [ AC_CONFIG_HEADERS([zfs_config.h], [
(mv zfs_config.h zfs_config.h.tmp && (mv zfs_config.h zfs_config.h.tmp &&