clean up usage of CL_API_ENTRY (#189)

* alternate method of exporting from a dll

* add back the def file

* a few more CL_API_ENTRY fixes

* a tiny bit of generated file cleanup

* Remove `CL_API_ENTRY` from layer wrappers.

* fix a few more extra CL_API_ENTRYs in tests

Co-authored-by: Brice Videau <bvideau@anl.gov>

Author: bashbaug

loader/icd.h

@@ -33,6 +33,18 @@
 #define CL_USE_DEPRECATED_OPENCL_1_2_APIS
 #endif
 
+#ifndef CL_USE_DEPRECATED_OPENCL_2_0_APIS
+#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
+#endif
+
+#ifndef CL_USE_DEPRECATED_OPENCL_2_1_APIS
+#define CL_USE_DEPRECATED_OPENCL_2_1_APIS
+#endif
+
+#ifndef CL_USE_DEPRECATED_OPENCL_2_2_APIS
+#define CL_USE_DEPRECATED_OPENCL_2_2_APIS
+#endif
+
 #include <CL/cl.h>
 #include <CL/cl_ext.h>
 #include <CL/cl_icd.h>
@@ -42,19 +54,19 @@
  * type definitions
  */
 
-typedef CL_API_ENTRY cl_int (CL_API_CALL *pfn_clIcdGetPlatformIDs)(
+typedef cl_int (CL_API_CALL *pfn_clIcdGetPlatformIDs)(
     cl_uint num_entries, 
     cl_platform_id *platforms, 
     cl_uint *num_platforms) CL_API_SUFFIX__VERSION_1_0;
 
-typedef CL_API_ENTRY cl_int (CL_API_CALL *pfn_clGetPlatformInfo)(
+typedef cl_int (CL_API_CALL *pfn_clGetPlatformInfo)(
     cl_platform_id   platform, 
     cl_platform_info param_name,
     size_t           param_value_size, 
     void *           param_value,
     size_t *         param_value_size_ret) CL_API_SUFFIX__VERSION_1_0;
 
-typedef CL_API_ENTRY void *(CL_API_CALL *pfn_clGetExtensionFunctionAddress)(
+typedef void *(CL_API_CALL *pfn_clGetExtensionFunctionAddress)(
     const char *function_name)  CL_API_SUFFIX__VERSION_1_0;
 
 typedef struct KHRicdVendorRec KHRicdVendor;

loader/icd_dispatch.c

@@ -16,8 +16,9 @@
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
-#include "icd_dispatch.h"
 #include "icd.h"
+#include "icd_dispatch.h"
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -147,7 +148,7 @@ static inline cl_int clGetPlatformIDs_body(
     return CL_SUCCESS;
 }
 
-CL_API_ENTRY cl_int CL_API_CALL clGetPlatformIDs_disp(
+cl_int CL_API_CALL clGetPlatformIDs_disp(
     cl_uint num_entries,
     cl_platform_id* platforms,
     cl_uint* num_platforms)
@@ -215,7 +216,7 @@ static inline void* clGetExtensionFunctionAddress_body(
     return NULL;
 }
 
-CL_API_ENTRY void* CL_API_CALL clGetExtensionFunctionAddress_disp(
+void* CL_API_CALL clGetExtensionFunctionAddress_disp(
     const char* function_name)
 {
     return clGetExtensionFunctionAddress_body(
@@ -261,7 +262,7 @@ static inline void* clGetExtensionFunctionAddressForPlatform_body(
         function_name);
 }
 
-CL_API_ENTRY void* CL_API_CALL clGetExtensionFunctionAddressForPlatform_disp(
+void* CL_API_CALL clGetExtensionFunctionAddressForPlatform_disp(
     cl_platform_id platform,
     const char* function_name)
 {