From 93e595c26720bcbf0d2db1651374971763584917 Mon Sep 17 00:00:00 2001
From: Alex Voicu <alexandru.voicu@amd.com>
Date: Wed, 29 Nov 2017 03:05:53 +0000
Subject: [PATCH] Fix compiler version check.

---
 hipamd/include/hip/hcc_detail/grid_launch_GGL.hpp | 2 +-
 hipamd/src/grid_launch.cpp                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hipamd/include/hip/hcc_detail/grid_launch_GGL.hpp b/hipamd/include/hip/hcc_detail/grid_launch_GGL.hpp
index 10dae540a4..95903436b6 100644
--- a/hipamd/include/hip/hcc_detail/grid_launch_GGL.hpp
+++ b/hipamd/include/hip/hcc_detail/grid_launch_GGL.hpp
@@ -19,10 +19,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
+#pragma once
 
 #if GENERIC_GRID_LAUNCH == 1
     #if __hcc_workweek__ >= 17481
-        #define FUNCTIONAL_GRID_LAUNCH 1
         #include "functional_grid_launch.hpp"
     #else
         #include "macro_based_grid_launch.hpp"
diff --git a/hipamd/src/grid_launch.cpp b/hipamd/src/grid_launch.cpp
index 8eb3f1dc75..1fe47c189a 100644
--- a/hipamd/src/grid_launch.cpp
+++ b/hipamd/src/grid_launch.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 #include "hip/hcc_detail/grid_launch_GGL.hpp"
 
-#if defined(FUNCTIONAL_GRID_LAUNCH)
+#if __hcc_workweek__ >= 17481
     #include "functional_grid_launch.inl"
 #else
     #include "macro_based_grid_launch.inl"