fix selective disabling of -Wunused-parameter under clang in copied weston code

Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Mike Blumenkrantz 2017-01-06 12:56:22 -05:00
parent 85589ab2b8
commit 989b0cd096
2 changed files with 7 additions and 10 deletions

View File

@ -27,12 +27,10 @@
#define E_COMP_WL #define E_COMP_WL
#include "e.h" #include "e.h"
#if __clang__ #if defined(__clang__)
#pragma clang diagnostic push # pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wunused-parameter"
#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 #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 #endif
#define ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \ #define ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \

View File

@ -2,14 +2,13 @@
* follows. * follows.
*/ */
#if __clang__ #if defined(__clang__)
#pragma clang diagnostic push # pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wunused-parameter"
#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 #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 #endif
/* /*
* Copyright © 2014, 2015 Collabora, Ltd. * Copyright © 2014, 2015 Collabora, Ltd.
* *