Merge pull request #1179 from stephengroat/cleanup-travis

changes have been pushed to OpenCL

.travis.yml

@@ -1,7 +1,3 @@
-# this is a workaround because some OpenCL headers cause problems with older gcc compilers (undefined macro: _WIN32)
-before_install:
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sed -i "" 's/if _WIN32/if defined (_WIN32)/' deps/OpenCL-Headers/CL/cl_platform.h; fi
- - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sed -i    's/if _WIN32/if defined (_WIN32)/' deps/OpenCL-Headers/CL/cl_platform.h; fi
 os:
   - linux
   - osx
@@ -9,5 +5,13 @@ language: c
 compiler:
   - clang
   - gcc
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      compiler: gcc
+    - os: linux
+      dist: trusty
+      compiler: clang
 script:
   - make

deps/OpenCL-Headers/CL

@@ -1 +1 @@
-Subproject commit 42e7afe066a67107c2236b86c9864a472f8eead8
+Subproject commit bf0f43b76f4556c3d5717f8ba8a01216b27f4af7