Allow configure script to run with clang-5, and fixed a minor

warning when compiling with clang++-5.
stella-emu · Feb 11, 2017 · c80f72b · c80f72b
1 parent c0a3a53
commit c80f72b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/configure b/configure
@@ -389,7 +389,7 @@ if test "$have_clang" = yes; then
 	fi
 
 	case $cxx_version in
-		[3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4].[0-9].[0-9])
+		[3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4-9].[0-9].[0-9])
 			_cxx_major=`echo $cxx_version | cut -d '.' -f 1`
 			_cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
 			cxx_version="$cxx_version, ok"

diff --git a/src/emucore/TIASurface.cxx b/src/emucore/TIASurface.cxx
@@ -211,7 +211,6 @@ uInt32 TIASurface::enableScanlines(int relative, int absolute)
   FBSurface::Attributes& attr = mySLineSurface->attributes();
   if(relative == 0)  attr.blendalpha = absolute;
   else               attr.blendalpha += relative;
-  attr.blendalpha = std::max(0u, attr.blendalpha);
   attr.blendalpha = std::min(100u, attr.blendalpha);
 
   mySLineSurface->applyAttributes();