Repository: trafficserver Updated Branches: refs/heads/5.3.x ec0bfea7b -> 98a2e1bb3
TS-3514: GCC compiler >= 4.1 should accept 5.x as well Signed-off-by: Marcin Juszkiewicz <[email protected]> (cherry picked from commit 5d67f230220765a18da9392a10239d94e7c5d94a) Conflicts: CHANGES Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/98a2e1bb Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/98a2e1bb Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/98a2e1bb Branch: refs/heads/5.3.x Commit: 98a2e1bb371b42b49d51b6ba667f110de614d4bf Parents: ec0bfea Author: Marcin Juszkiewicz <[email protected]> Authored: Thu Apr 9 13:24:40 2015 +0200 Committer: Phil Sorber <[email protected]> Committed: Thu Apr 9 10:36:01 2015 -0600 ---------------------------------------------------------------------- CHANGES | 3 +++ lib/ts/ink_atomic.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/98a2e1bb/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 27557f2..41e839b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.3.0 + *) [TS-3514] Atomic check for gcc >4.1 breaks with gcc 5.0 + Author: Marcin Juszkiewicz <[email protected]> + *) [TS-3480] Large stream id cause PROTOCOL_ERROR. Author: Ryo Okubo <[email protected]>. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/98a2e1bb/lib/ts/ink_atomic.h ---------------------------------------------------------------------- diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h index 84fc470..8d6037b 100644 --- a/lib/ts/ink_atomic.h +++ b/lib/ts/ink_atomic.h @@ -63,7 +63,8 @@ typedef vlong *pvlong; typedef vvoidp *pvvoidp; /* GCC compiler >= 4.1 */ -#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 1) +#if defined(__GNUC__) && ( ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)) || (__GNUC__ >= 5) ) + /* see http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Atomic-Builtins.html */
