5 files changed, 12 insertions, 9 deletions
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c b/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c
index ac9f2dc..6007d41 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c
@@ -36,6 +36,7 @@
 
 #include "xfs.h"
 
+#include "xfs_macros.h"
 #include "xfs_fs.h"
 #include "xfs_inum.h"
 #include "xfs_log.h"
@@ -156,7 +157,7 @@ xfs_iozero(
 	size_t			count,	/* size of data to zero		*/
 	loff_t			end_size)	/* max file size to set */
 {
-#if XXXKAN
+#ifdef XXXKAN
 	unsigned		bytes;
 	struct page		*page;
 	struct address_space	*mapping;
@@ -307,7 +308,7 @@ xfs_read(
 
 	if (!(ioflags & IO_ISLOCKED))
 		xfs_ilock(ip, XFS_IOLOCK_SHARED);
-#if XXXKAN
+#ifdef XXXKAN
 	if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) &&
 	    !(ioflags & IO_INVIS)) {
 		int error;
@@ -581,7 +582,7 @@ xfs_write(
 	int		ioflags,
 	cred_t          *credp)
 {
-#if XXXKAN
+#ifdef XXXKAN
 	xfs_inode_t	*xip;
 	xfs_mount_t	*mp;
 	ssize_t		ret;
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c b/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c
index 5a581ab..dec6e2f 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c
@@ -70,7 +70,7 @@ fs_tosspages(
 	xfs_off_t	last,
 	int		fiopt)
 {
-#if XXXKAN
+#ifdef XXXKAN
 	vnode_t		*vp = BHV_TO_VNODE(bdp);
 	struct inode	*ip = LINVFS_GET_IP(vp);
 
@@ -91,7 +91,7 @@ fs_flushinval_pages(
 	xfs_off_t	last,
 	int		fiopt)
 {
-#if XXXKAN
+#ifdef XXXKAN
 	vnode_t		*vp = BHV_TO_VNODE(bdp);
 	struct inode	*ip = LINVFS_GET_IP(vp);
 
@@ -117,7 +117,7 @@ fs_flush_pages(
 	uint64_t	flags,
 	int		fiopt)
 {
-#if XXXKAN
+#ifdef XXXKAN
 	vnode_t		*vp = BHV_TO_VNODE(bdp);
 	struct inode	*ip = LINVFS_GET_IP(vp);
 
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c b/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c
index 45485bb..766d8c2 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c
@@ -435,7 +435,7 @@ xfs_inode_lock_init(
 	mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER,
 		     "xfsino", (long)vp->v_number);
 	mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", vp->v_number);
-#if XXXKAN
+#ifdef XXXKAN
 	init_waitqueue_head(&ip->i_ipin_wait);
 #endif
 	atomic_set(&ip->i_pincount, 0);
@@ -653,7 +653,7 @@ xfs_iextract(
 		}
 	}
 
-#if XXXKAN
+#ifdef XXXKAN
 	/*
 	 * Not sure if while i_reclaim crap is needed on
 	 * FreeBSD, will revisit this later.
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c b/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
index 40c3159..323a1c0 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
@@ -32,6 +32,7 @@
 
 #include "xfs.h"
 
+#include "xfs_macros.h"
 #include "xfs_fs.h"
 #include "xfs_inum.h"
 #include "xfs_log.h"
@@ -68,7 +69,7 @@
 #include "xfs_fsops.h"
 
 
-#if XXXKAN
+#ifdef XXXKAN
 /*
  * ioctl commands that are used by Linux filesystems
  */
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_super.c b/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
index 7f23f42..b971287 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
@@ -32,6 +32,7 @@
 
 #include "xfs.h"
 
+#include "xfs_macros.h"
 #include "xfs_inum.h"
 #include "xfs_log.h"
 #include "xfs_clnt.h"