commit cb84173d16832f42747931c7b64dfed08f964da6
author Erik de Castro Lopo <erikd@mega-nerd.com> Thu Aug 20 19:39:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 19:39:08 2015 +0000
tree da5996ee140a6d71b73f4e4a5dea57fb634fcf08
parent 8e7de0cac99e88fbe2245a5d74a205ff1b42a80c
parent 4e2a8e33b7b741a19ff658bad8623541a759e44f

am 4e2a8e33: am 649952f9: am 1e5f0b6c: am 1d948ef7: libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow.

* commit '4e2a8e33b7b741a19ff658bad8623541a759e44f':
  libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow.

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); \