From fcd0c3703e4ae91b9593a23ef1dd6e55255d1c04 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Tue, 27 Oct 2015 15:56:54 -0400
Subject: [PATCH] P4 to Git Change 1204450 by lmoriche@lmoriche_opencl_dev on
 2015/10/27 15:48:04

	SWDEV-78467 - Enable the LF library build on Windows 64-bit. Disable on mainline.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#125 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#46 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp#6 edit
---
 opencl/api/opencl/amdocl/cl_context.cpp      | 6 +++---
 opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opencl/api/opencl/amdocl/cl_context.cpp b/opencl/api/opencl/amdocl/cl_context.cpp
index 1abf6ae045..0f659adb39 100644
--- a/opencl/api/opencl/amdocl/cl_context.cpp
+++ b/opencl/api/opencl/amdocl/cl_context.cpp
@@ -513,7 +513,7 @@ clGetExtensionFunctionAddress(const char* func_name)
 #if cl_khr_il_program
         CL_EXTENSION_ENTRYPOINT_CHECK(clCreateProgramWithILKHR);
 #endif // cl_khr_il_program
-#if cl_amd_liquid_flash
+#if cl_amd_liquid_flash && !defined(OPENCL_MAINLINE)
         CL_EXTENSION_ENTRYPOINT_CHECK(clCreateFileObjectAMD);
 #endif // cl_amd_liquid_flash
         break;
@@ -535,7 +535,7 @@ clGetExtensionFunctionAddress(const char* func_name)
         CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueWaitSignalAMD);
         CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueWriteSignalAMD);
         CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueMakeBuffersResidentAMD);
-#if cl_amd_liquid_flash
+#if cl_amd_liquid_flash  && !defined(OPENCL_MAINLINE)
         CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueWriteBufferFromFileAMD);
 #endif // cl_amd_liquid_flash
         break;
@@ -597,7 +597,7 @@ clGetExtensionFunctionAddress(const char* func_name)
         CL_EXTENSION_ENTRYPOINT_CHECK(clRetainDeviceEXT);
         CL_EXTENSION_ENTRYPOINT_CHECK(clReleaseDeviceEXT);
 #endif // cl_ext_device_fission
-#if cl_amd_liquid_flash
+#if cl_amd_liquid_flash  && !defined(OPENCL_MAINLINE)
         CL_EXTENSION_ENTRYPOINT_CHECK(clRetainFileObjectAMD);
         CL_EXTENSION_ENTRYPOINT_CHECK(clReleaseFileObjectAMD);
 #endif // cl_amd_liquid_flash
diff --git a/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp b/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp
index f51ac6424e..44947fa080 100644
--- a/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp
+++ b/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp
@@ -13,11 +13,11 @@
 typedef wchar_t char_t;
 #endif // __linux__
 
-#if defined(_WIN32) && !defined(_LP64)
+#if !defined(OPENCL_MAINLINE) && defined(_WIN32)
 #define WITH_LIQUID_FLASH 1
 #endif // _WIN32
 
-#if defined WITH_LIQUID_FLASH
+#if defined(WITH_LIQUID_FLASH)
 #include "lf.h"
 #endif // WITH_LIQUID_FLASH