commit 30c74366eb5e6324563d9ee4e2bd4947708e432d
author Chih-Hung Hsieh <chh@google.com> Fri Feb 27 12:19:59 2015 -0800
committer The Android Automerger <android-build@google.com> Tue Sep 08 13:36:40 2015 -0700
tree d474b003e345b97087a70f6c38cee38518efc66b
parent ce4ad0ef39996e8c0a50fa84a420be5671dfabe8

Add macro definitions for clang/llvm.

b/23238405
b/23793209

Change-Id: I62d1a167eebfb266e846b1de7f23873f1dfdab56
(cherry picked from commit 5859ae22db0a2d16af3e3ca19d582de37daf5eb6)

libFLAC/include/private/macros.h

diff --git a/libFLAC/include/private/macros.h b/libFLAC/include/private/macros.h
index b72b69b..fd48a7f 100644
--- a/libFLAC/include/private/macros.h
+++ b/libFLAC/include/private/macros.h
@@ -32,7 +32,7 @@
 #ifndef FLAC__PRIVATE__MACROS_H
 #define FLAC__PRIVATE__MACROS_H
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 3))
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
 
 #define flac_max(a,b) \
     ({ __typeof__ (a) _a = (a); \