From 989b0cd096fa588359070ac1703079c5ae95c6da Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 6 Jan 2017 12:56:22 -0500 Subject: [PATCH] fix selective disabling of -Wunused-parameter under clang in copied weston code Reviewed-by: Derek Foreman --- src/bin/e_comp_wl_data.c | 8 +++----- src/bin/e_comp_wl_dmabuf.c | 9 ++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c index 490fd0749..f8bd967ec 100644 --- a/src/bin/e_comp_wl_data.c +++ b/src/bin/e_comp_wl_data.c @@ -27,12 +27,10 @@ #define E_COMP_WL #include "e.h" -#if __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-parameter" +#if defined(__clang__) +# pragma clang diagnostic ignored "-Wunused-parameter" #elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic ignored "-Wunused-parameter" #endif #define ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \ diff --git a/src/bin/e_comp_wl_dmabuf.c b/src/bin/e_comp_wl_dmabuf.c index f48ee19ca..6efba605d 100644 --- a/src/bin/e_comp_wl_dmabuf.c +++ b/src/bin/e_comp_wl_dmabuf.c @@ -2,14 +2,13 @@ * follows. */ -#if __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-parameter" +#if defined(__clang__) +# pragma clang diagnostic ignored "-Wunused-parameter" #elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic ignored "-Wunused-parameter" #endif + /* * Copyright © 2014, 2015 Collabora, Ltd. *