summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2015-02-27 12:19:59 -0800
committerZach Jang <zachjang@google.com>2015-09-08 16:31:43 +0000
commit2470e51d31463a7aead2d780b0d287b7c693235f (patch)
treed474b003e345b97087a70f6c38cee38518efc66b
parent63541e6d79b008f0f0632b2e0d368d3305c4f475 (diff)
downloadandroid_external_flac-2470e51d31463a7aead2d780b0d287b7c693235f.tar.gz
android_external_flac-2470e51d31463a7aead2d780b0d287b7c693235f.tar.bz2
android_external_flac-2470e51d31463a7aead2d780b0d287b7c693235f.zip
Add macro definitions for clang/llvm.
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 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); \