From: Gary Lockyer Date: Thu, 30 Apr 2020 23:58:52 +0000 (+1200) Subject: Fix clang 9 enum-conversion warnings X-Git-Tag: ldb-2.2.0~566 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d55812e4eee41fa913a9d102a54ee4d7f85fc2bc;p=thirdparty%2Fsamba.git Fix clang 9 enum-conversion warnings Signed-off-by: Gary Lockyer Reviewed-by: Andreas Schneider --- diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 339ad4a708a..f0491bcd36f 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -795,7 +795,6 @@ int main(void) { conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=for-loop-analysis', testflags=True) conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=missing-field-initializers', testflags=True) conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=unused-function', testflags=True) - conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=enum-conversion', testflags=True) if Options.options.fatal_errors: conf.ADD_CFLAGS('-Wfatal-errors', testflags=True) diff --git a/source4/torture/smb2/timestamps.c b/source4/torture/smb2/timestamps.c index 89b64886e4d..f0cc9c269ff 100644 --- a/source4/torture/smb2/timestamps.c +++ b/source4/torture/smb2/timestamps.c @@ -390,7 +390,7 @@ static bool test_delayed_write_vs_seteof(struct torture_context *tctx, torture_comment(tctx, "Set write time on file-handle 2\n"); setinfo = (union smb_setfileinfo) { - .generic.level = RAW_FILEINFO_BASIC_INFORMATION, + .generic.level = SMB_QFILEINFO_BASIC_INFORMATION, }; setinfo.generic.in.file.handle = h2; unix_to_nt_time(&set_time, time(NULL) + 86400);