s4:ntvfs: Use #ifdef instead of #if for config.h definitions
authorAndreas Schneider <asn@samba.org>
Wed, 21 Nov 2018 10:36:23 +0000 (11:36 +0100)
committerGary Lockyer <gary@samba.org>
Wed, 28 Nov 2018 22:19:24 +0000 (23:19 +0100)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
source4/ntvfs/posix/pvfs_read.c
source4/ntvfs/posix/pvfs_write.c
source4/ntvfs/posix/vfs_posix.c

index f60b721e418cc49605130160bd1c04d121c8d502..23cbe458ed699afd238a74495fa517fe4dbc52f1 100644 (file)
@@ -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)) {
index 544e254300b2033debc1ed7fb1192c664275d7f4..e4725ec579f22c9e785465adcaba2b990f8ef453 100644 (file)
@@ -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)) {
index 4133723c50a78cac8f1ed9f2f4e66f3b2915cdbb..df5637486d38acd86bef0681f1c26daac0027890 100644 (file)
@@ -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