[libvirt] [PATCH 4/5] Ignore SASL deprecation warnings on OS-X

Apple have annotated all SASL functions as deprecated for unknown reasons. Since they still work, lets just ignore the warnings. If Apple finally delete the SASL functions our configure check should already catch that Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/internal.h | 5 +++++ src/rpc/virnetsaslcontext.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/internal.h b/src/internal.h index b1a0556..713734c 100644 --- a/src/internal.h +++ b/src/internal.h @@ -265,6 +265,10 @@ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wcast-align\"") +# define VIR_WARNINGS_NO_DEPRECATED \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") + # if HAVE_SUGGEST_ATTRIBUTE_FORMAT # define VIR_WARNINGS_NO_PRINTF \ _Pragma ("GCC diagnostic push") \ @@ -289,6 +293,7 @@ _Pragma ("GCC diagnostic pop") # else # define VIR_WARNINGS_NO_CAST_ALIGN +# define VIR_WARNINGS_NO_DEPRECATED # define VIR_WARNINGS_NO_PRINTF # define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR # define VIR_WARNINGS_RESET diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index c4492ec..a7b891f 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -73,6 +73,14 @@ static int virNetSASLContextOnceInit(void) VIR_ONCE_GLOBAL_INIT(virNetSASLContext) +/* Apple have annotated all SASL functions as deprecated for + * unknown reasons. Since they still work, lets just ignore + * the warnings. If Apple finally delete the SASL functions + * our configure check should already catch that + */ +#ifdef __APPLE__ +VIR_WARNINGS_NO_DEPRECATED +#endif virNetSASLContextPtr virNetSASLContextNewClient(void) { @@ -686,3 +694,7 @@ void virNetSASLSessionDispose(void *obj) sasl_dispose(&sasl->conn); VIR_FREE(sasl->callbacks); } + +#ifdef __APPLE__ +VIR_WARNINGS_RESET +#endif -- 2.9.3