4 files changed, 19 insertions, 16 deletions
diff --git a/make/config/cl-common.cfg b/make/config/cl-common.cfg
index d89643b9..8e1adf16 100644
--- a/make/config/cl-common.cfg
+++ b/make/config/cl-common.cfg
@@ -1,5 +1,5 @@
 JavaOutputDir   gensrc/java
-NativeOutputDir gensrc/native
+NativeOutputDir gensrc/native/jocl
 
 Package com.jogamp.opencl.llb
 
diff --git a/make/config/cl-if.cfg b/make/config/cl-if.cfg
index 2078123a..8b5322f7 100644
--- a/make/config/cl-if.cfg
+++ b/make/config/cl-if.cfg
@@ -19,17 +19,17 @@ Extends CL CLSamplerBinding
 Extends CL CLEventBinding
 Extends CL CLPlatformBinding
 
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLContextBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLProgramBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLKernelBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLCommandQueueBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLDeviceBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLMemObjBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLImageBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLBufferBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLSamplerBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLEventBinding.java
-ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLPlatformBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLContextBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLProgramBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLKernelBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLCommandQueueBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLDeviceBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLMemObjBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLImageBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLBufferBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLSamplerBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLEventBinding.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLPlatformBinding.java
 
 #ignore cl-gl interoperability functions. Interface 'CL' is pure OpenCL.
 Ignore CL_GL_.*|cl.*GL.*|.*_GL_.*
diff --git a/make/config/cl-impl.cfg b/make/config/cl-impl.cfg
index 4beb22b3..a7b53950 100644
--- a/make/config/cl-impl.cfg
+++ b/make/config/cl-impl.cfg
@@ -16,10 +16,13 @@ ImplJavaClass CLAbstractImpl
 AccessControl CLAbstractImpl PUBLIC_ABSTRACT
 Implements CLAbstractImpl CLGL
 
+LocalProcAddressCallingConvention __ALL__ CL_API_CALL
+
 EmitProcAddressTable true
 ProcAddressTableClassName CLProcAddressTable
 GetProcAddressTableExpr addressTable
 ProcAddressNameExpr $UpperCase(arg)
+ForceProcAddressGen __ALL__
 
 #dynamic binding for OpenGL specific functions...
 #ForceProcAddressGen clGetGLContextInfoKHR
diff --git a/make/config/clImplCustomCode.c b/make/config/clImplCustomCode.c
index 751f819b..6a5da4f0 100644
--- a/make/config/clImplCustomCode.c
+++ b/make/config/clImplCustomCode.c
@@ -116,7 +116,7 @@ CL_CALLBACK void memObjDestructorCallback(cl_mem mem, void * object) {
 
 JNIEXPORT jlong JNICALL
 Java_com_jogamp_opencl_llb_impl_CLAbstractImpl_dispatch_1clGetExtensionFunctionAddressStatic(JNIEnv *env, jclass _unused, jstring fname, jlong procAddress) {
-  typedef void* (CL_API_ENTRY*_local_LPCLGETPROCADDRESS)(const char *  fname);
+  typedef void* (CL_API_CALL * _local_LPCLGETPROCADDRESS)(const char *  fname);
   _local_LPCLGETPROCADDRESS ptr_clGetExtensionFunctionAddress;
   const char* _strchars_fname = NULL;
   void* _res;
@@ -130,7 +130,7 @@ Java_com_jogamp_opencl_llb_impl_CLAbstractImpl_dispatch_1clGetExtensionFunctionA
   }
   ptr_clGetExtensionFunctionAddress = (_local_LPCLGETPROCADDRESS) (intptr_t) procAddress;
   assert(ptr_clGetExtensionFunctionAddress != NULL);
-  _res = (* ptr_clGetExtensionFunctionAddress) ((char *) _strchars_fname);
+  _res = (* ptr_clGetExtensionFunctionAddress) (_strchars_fname);
   if ( NULL != fname ) {
     (*env)->ReleaseStringUTFChars(env, fname, _strchars_fname);
   }
@@ -210,7 +210,7 @@ Java_com_jogamp_opencl_llb_impl_CLImpl_clCreateContext0(JNIEnv *env, jobject _un
     cccallback _pfn_notify = NULL;
     jobject globalCB = NULL;
 
-    typedef cl_context (*function)(cl_context_properties *, cl_uint, const cl_device_id *, void (*pfn_notify)(const char *, const void *, size_t, void *), void *, cl_int *);
+    typedef cl_context (CL_API_CALL * function)(cl_context_properties *, cl_uint, const cl_device_id *, void (*pfn_notify)(const char *, const void *, size_t, void *), void *, cl_int *);
     function clCreateContext = (function)(intptr_t) procAddress;
 
     if (props != NULL) {
@@ -286,7 +286,7 @@ Java_com_jogamp_opencl_llb_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unu
     bpcallback _pfn_notify = NULL;
     jobject globalCB = NULL;
 
-    typedef cl_int (*function)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK *)(cl_program, void *), void *);
+    typedef cl_int (CL_API_CALL * function)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK *)(cl_program, void *), void *);
     function clBuildProgram = (function)(intptr_t)procAddress;
 
     if (options != NULL) {