From: Andreas Schneider Date: Wed, 21 Nov 2018 10:36:23 +0000 (+0100) Subject: s4:ntvfs: Use #ifdef instead of #if for config.h definitions X-Git-Tag: tdb-1.3.17~546 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c4d588f4777548f81881024e4ed0c08e3ac20b6;p=thirdparty%2Fsamba.git s4:ntvfs: Use #ifdef instead of #if for config.h definitions Signed-off-by: Andreas Schneider Reviewed-by: Gary Lockyer --- diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c index f60b721e418..23cbe458ed6 100644 --- a/source4/ntvfs/posix/pvfs_read.c +++ b/source4/ntvfs/posix/pvfs_read.c @@ -76,7 +76,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs, ret = pvfs_stream_read(pvfs, f->handle, rd->readx.out.data, maxcnt, rd->readx.in.offset); } else { -#if HAVE_LINUX_AIO +#ifdef HAVE_LINUX_AIO /* possibly try an aio read */ if ((req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC) && (pvfs->flags & PVFS_FLAG_LINUX_AIO)) { diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c index 544e254300b..e4725ec579f 100644 --- a/source4/ntvfs/posix/pvfs_write.c +++ b/source4/ntvfs/posix/pvfs_write.c @@ -124,7 +124,7 @@ NTSTATUS pvfs_write(struct ntvfs_module_context *ntvfs, wr->writex.in.count, wr->writex.in.offset); } else { -#if HAVE_LINUX_AIO +#ifdef HAVE_LINUX_AIO /* possibly try an aio write */ if ((req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC) && (pvfs->flags & PVFS_FLAG_LINUX_AIO)) { diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index 4133723c50a..df5637486d3 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -92,7 +92,7 @@ static void pvfs_setup_options(struct pvfs_state *pvfs) PVFS_SEARCH_INACTIVITY, PVFS_SEARCH_INACTIVITY_DEFAULT); -#if HAVE_XATTR_SUPPORT +#ifdef HAVE_XATTR_SUPPORT if (share_bool_option(scfg, PVFS_XATTR, PVFS_XATTR_DEFAULT)) pvfs->flags |= PVFS_FLAG_XATTR_ENABLE; #endif