summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2015-09-08 18:24:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-08 18:24:51 +0000
commitf9d095a5188ee264bd5227e2a4021e823790f047 (patch)
tree3647d19671592c75fa7c4c131f866344c0ad6d6b
parent85df1e3a186a144d67206a9e1f05fb883c34a1ba (diff)
parent2470e51d31463a7aead2d780b0d287b7c693235f (diff)
downloadandroid_external_flac-f9d095a5188ee264bd5227e2a4021e823790f047.tar.gz
android_external_flac-f9d095a5188ee264bd5227e2a4021e823790f047.tar.bz2
android_external_flac-f9d095a5188ee264bd5227e2a4021e823790f047.zip
am 2470e51d: Add macro definitions for clang/llvm.
* commit '2470e51d31463a7aead2d780b0d287b7c693235f': Add macro definitions for clang/llvm.
-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 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); \