stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-13 05:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

travis: Fixedup gcc 5 error and allow gcc 6 to fail

Browse source
This commit is contained in:
Alam Ed Arias 2016-05-28 18:39:15 -04:00
parent c76c5152c2
commit f4a84c916e
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -3,6 +3,8 @@ sudo: required
dist: trusty dist: trusty
matrix: matrix:
allow_failures:
compiler: gcc-6
include: include:
- os: linux - os: linux
compiler: gcc compiler: gcc
@ -73,9 +75,9 @@ matrix:
osx_image: beta-xcode6.2 osx_image: beta-xcode6.2
compiler: gcc compiler: gcc
#Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn) #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
# - os: osx - os: osx
# osx_image: beta-xcode6.3 osx_image: beta-xcode6.3
# # #
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)

2
src/sdl/i_main.c
View file

@ -245,7 +245,7 @@ int main(int argc, char **argv)
#endif #endif
// return to OS // return to OS
#ifndef __GNUC__ #if !defined (__GNUC__) || (__GNUC__ < 5)
return 0; return 0;
#endif #endif
} }