From f9ea06f3ce30d5b786ff941301a4a0872f2f5b3f Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Wed, 1 Sep 2021 15:40:28 +0200 Subject: [PATCH] Fix compilation error on redhat7 --- bacula/src/plugins/fd/pluginlib/metaplugin.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/bacula/src/plugins/fd/pluginlib/metaplugin.cpp b/bacula/src/plugins/fd/pluginlib/metaplugin.cpp index e81a91d82..3bd8e0e5a 100644 --- a/bacula/src/plugins/fd/pluginlib/metaplugin.cpp +++ b/bacula/src/plugins/fd/pluginlib/metaplugin.cpp @@ -1821,12 +1821,8 @@ bRC METAPLUGIN::perform_accurate_check(bpContext *ctx) DMSG0(ctx, DDEBUG, "perform_accurate_check()\n"); POOL_MEM cmd(PM_FNAME); -#if __cplusplus >= 201103L - struct save_pkt sp {0}; -#else struct save_pkt sp; - memset(sp, 0, sizeof(sp)); -#endif + memset(&sp, 0, sizeof(sp)); // supported sequence is `STAT` followed by `TSTAMP` if (backend.ctx->read_command(ctx, cmd) < 0) { @@ -1917,12 +1913,8 @@ bRC METAPLUGIN::perform_accurate_check_get(bpContext *ctx) return bRC_OK; } -#if __cplusplus >= 201103L - accurate_attribs_pkt attribs {0}; -#else accurate_attribs_pkt attribs; - memset(attribs, 0, sizeof(attribs)); -#endif + memset(&attribs, 0, sizeof(attribs)); attribs.fname = fname.c_str(); bRC rc = getAccurateAttribs(&attribs); -- 2.47.3