aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2015-02-27 12:19:59 -0800
committerThe Android Automerger <android-build@google.com>2015-09-08 13:36:40 -0700
commit30c74366eb5e6324563d9ee4e2bd4947708e432d (patch)
treed474b003e345b97087a70f6c38cee38518efc66b
parentce4ad0ef39996e8c0a50fa84a420be5671dfabe8 (diff)
downloadflac-android-5.1.1_r25.tar.gz
b/23238405 b/23793209 Change-Id: I62d1a167eebfb266e846b1de7f23873f1dfdab56 (cherry picked from commit 5859ae22db0a2d16af3e3ca19d582de37daf5eb6)
-rw-r--r--libFLAC/include/private/macros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libFLAC/include/private/macros.h b/libFLAC/include/private/macros.h
index b72b69bc..fd48a7fa 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); \