Skip to content

Commit 11dbba9

Browse files
committed
zfs-on-linux: don't try to redefine boolean_t
1 parent e1560e3 commit 11dbba9

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ ifeq ($(SYSTEM), Linux)
6363
ifneq (,$(LIBZFS_VER))
6464
HAVE_ZFS := $(USE_ZFS)
6565
LIBZFS_CFLAGS = $(shell pkg-config --cflags libzfs)
66+
LIBZFS_CFLAGS += -DUSING_SPL
6667
LIBZFS_LIBS = $(shell pkg-config --libs libzfs) -lnvpair
6768
else
6869
HAVE_ZFS := no

pivy-zfs.c

-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@
5757
#include <libnvpair.h>
5858
#include <sys/dmu.h>
5959

60-
#define USING_SPL
61-
6260
#include "openssh/config.h"
6361
#include "openssh/sshkey.h"
6462
#include "openssh/sshbuf.h"

0 commit comments

Comments
 (0)