[Libreoffice-commits] core.git: external/libmwaw

[David Tardon]

 external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8cba7fd59eae4dfb88a6b16653eaf880bbb0e3c0
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jul 17 14:18:12 2017 +0200

    try harder
    
    Change-Id: I575a61ba87218fe1071cfd151dd6de27c9df7085

diff --git a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
index c983002f086f..dbbe6bfd204c 100644
--- a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
+++ b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
@@ -19,7 +19,8 @@ index 4c9580d..cbf0fc0 100644
  
  /** fall through attributes */
 -#define MWAW_FALLTHROUGH
- #if defined(__clang__)
+-#if defined(__clang__)
++#if defined(__clang__) && defined(__has_cpp_attribute)
 -#  if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
 -#    undef MWAW_FALLTHROUGH
 +#  if __has_cpp_attribute(clang::fallthrough)