From f4a84c916e6639bf28915e1e7cea7bb14472a3ec Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 18:39:15 -0400
Subject: [PATCH] travis: Fixedup gcc 5 error and allow gcc 6 to fail
---
.travis.yml | 8 +++++---
src/sdl/i_main.c | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5b414f9754..eabc52f466 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ sudo: required
dist: trusty
matrix:
+ allow_failures:
+ compiler: gcc-6
include:
- os: linux
compiler: gcc
@@ -73,9 +75,9 @@ matrix:
osx_image: beta-xcode6.2
compiler: gcc
#Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
-# - os: osx
-# osx_image: beta-xcode6.3
-# #
+ - os: osx
+ osx_image: beta-xcode6.3
+ #
- os: osx
osx_image: xcode6.4
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 74b61339bb..a12ff6376a 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -245,7 +245,7 @@ int main(int argc, char **argv)
#endif
// return to OS
-#ifndef __GNUC__
+#if !defined (__GNUC__) || (__GNUC__ < 5)
return 0;
#endif
}
--
GitLab