From: Ulrich Klauer <ulrich@chirlu.de>
Date: Sat, 25 May 2013 13:12:33 +0000 (+0200)
Subject: Fix gcc version check for private macros
X-Git-Tag: 1.3.0~10
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fflac.git;a=commitdiff_plain;h=d672efaa05e18ca2bf906c6e8eb8d5bf20f88664

Fix gcc version check for private macros

Use Benjamin Stiglitz' MIN macros from gcc 4.3 (according to the
changelog, __COUNTER__ was introduced in this version). Previously,
the macros weren't used on any existing gcc version; the first one
would have been 5.5.

Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
---

diff --git a/src/libFLAC/include/private/macros.h b/src/libFLAC/include/private/macros.h
index 162bcaf..8282ca2 100644
--- a/src/libFLAC/include/private/macros.h
+++ b/src/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_MINOR__ > 4)
+#if defined(__GNUC__) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 3))
 
 #define flac_max(a,b) \
     ({ __typeof__ (a) _a = (a); \