Move CL_*_SUFFIX__VERSION_* to before function declarator, as needed with recent compilers on macos

socl/src/cl_buildprogram.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2016-2017                           CNRS
- * Copyright (C) 2010-2012                                Université de Bordeaux
+ * Copyright (C) 2010-2012, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -76,13 +76,14 @@ static void soclBuildProgram_task(void *data)
 	DEBUG_MSG("[Worker %d] Done building.\n", wid);
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclBuildProgram(cl_program         program,
 		 cl_uint              num_devices,
 		 const cl_device_id * device_list,
 		 const char *         options, 
 		 void (*pfn_notify)(cl_program program, void * user_data),
-		 void *               user_data) CL_API_SUFFIX__VERSION_1_0
+		 void *               user_data)
 {
 	struct bp_data *data;
 

socl/src/cl_createbuffer.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2013                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -49,12 +49,13 @@ static void release_callback_memobject(void * e)
  * should avoid it.
  *
  */
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_mem CL_API_CALL
 soclCreateBuffer(cl_context   context,
 		 cl_mem_flags flags,
 		 size_t       size,
 		 void *       host_ptr,
-		 cl_int *     errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		 cl_int *     errcode_ret)
 {
 	cl_mem mem;
 

socl/src/cl_createcommandqueue.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2014,2017                           CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -37,11 +37,12 @@ static void release_callback_command_queue(void * e)
 	STARPU_PTHREAD_MUTEX_DESTROY(&cq->mutex);
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_command_queue CL_API_CALL
 soclCreateCommandQueue(cl_context                   context,
 		       cl_device_id                   device,
 		       cl_command_queue_properties    properties,
-		       cl_int *                       errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		       cl_int *                       errcode_ret)
 {
 	cl_command_queue cq;
 

socl/src/cl_createcontext.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012-2013,2017                           CNRS
- * Copyright (C) 2010-2013                                Université de Bordeaux
+ * Copyright (C) 2010-2013, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -35,13 +35,14 @@ static void release_callback_context(void * e)
 static char * defaultScheduler = "dmda";
 static char * defaultName = "default";
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_context CL_API_CALL
 soclCreateContext(const cl_context_properties * properties,
 		  cl_uint                       num_devices,
 		  const cl_device_id *          devices,
 		  void (*pfn_notify)(const char *, const void *, size_t, void *),
 		  void *                        user_data,
-		  cl_int *                      errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		  cl_int *                      errcode_ret)
 {
 	if (pfn_notify == NULL && user_data != NULL)
 	{

socl/src/cl_createcontextfromtype.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2012,2016                           Université de Bordeaux
+ * Copyright (C) 2010-2012,2016, 2018                           Université de Bordeaux
  * Copyright (C) 2012                                     Vincent Danjean
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,12 +20,13 @@
 #include "socl.h"
 #include "init.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_context CL_API_CALL
 soclCreateContextFromType(const cl_context_properties * properties,
 			  cl_device_type                device_type,
 			  void (*pfn_notify)(const char *, const void *, size_t, void *),
 			  void *                        user_data,
-			  cl_int *                      errcode_ret) CL_API_SUFFIX__VERSION_1_0
+			  cl_int *                      errcode_ret)
 {
 	if (socl_init_starpu() < 0)
 		return NULL;

socl/src/cl_createimage2d.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_mem CL_API_CALL
 soclCreateImage2D(cl_context              UNUSED(context),
 		  cl_mem_flags            UNUSED(flags),
@@ -26,7 +27,7 @@ soclCreateImage2D(cl_context              UNUSED(context),
 		  size_t                  UNUSED(image_height),
 		  size_t                  UNUSED(image_row_pitch),
 		  void *                  UNUSED(host_ptr),
-		  cl_int *                errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		  cl_int *                errcode_ret)
 {
 	if (errcode_ret != NULL)
 		*errcode_ret = CL_INVALID_OPERATION;

socl/src/cl_createimage3d.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_mem CL_API_CALL
 soclCreateImage3D(cl_context              UNUSED(context),
 		  cl_mem_flags            UNUSED(flags),
@@ -28,7 +29,7 @@ soclCreateImage3D(cl_context              UNUSED(context),
 		  size_t                  UNUSED(image_row_pitch),
 		  size_t                  UNUSED(image_slice_pitch),
 		  void *                  UNUSED(host_ptr),
-		  cl_int *                errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		  cl_int *                errcode_ret)
 {
 	if (errcode_ret != NULL)
 		*errcode_ret = CL_INVALID_OPERATION;

socl/src/cl_createkernel.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2014,2016-2017                      CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -117,10 +117,11 @@ static void release_callback_kernel(void * e)
 	free(kernel->errcodes);
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_kernel CL_API_CALL
 soclCreateKernel(cl_program    program,
 		 const char *    kernel_name,
-		 cl_int *        errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		 cl_int *        errcode_ret)
 {
 	cl_kernel k;
 

socl/src/cl_createkernelsinprogram.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,11 +18,12 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclCreateKernelsInProgram(cl_program   UNUSED(program),
 			   cl_uint        UNUSED(num_kernels),
 			   cl_kernel *    UNUSED(kernels),
-			   cl_uint *      UNUSED(num_kernels_ret)) CL_API_SUFFIX__VERSION_1_0
+			   cl_uint *      UNUSED(num_kernels_ret))
 {
 	//TODO
 	return CL_INVALID_OPERATION;

socl/src/cl_createprogramwithbinary.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_program CL_API_CALL
 soclCreateProgramWithBinary(cl_context                     UNUSED(context),
 			    cl_uint                        UNUSED(num_devices),
@@ -25,7 +26,7 @@ soclCreateProgramWithBinary(cl_context                     UNUSED(context),
 			    const size_t *                 UNUSED(lengths),
 			    const unsigned char **         UNUSED(binaries),
 			    cl_int *                       UNUSED(binary_status),
-			    cl_int *                       errcode_ret) CL_API_SUFFIX__VERSION_1_0
+			    cl_int *                       errcode_ret)
 {
 	//TODO
 	if (errcode_ret != NULL)

socl/src/cl_createprogramwithsource.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2016-2017                           CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -66,12 +66,13 @@ static void release_callback_program(void * e)
 		free(program->options);
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_program CL_API_CALL
 soclCreateProgramWithSource(cl_context      context,
 			    cl_uint           count,
 			    const char **     strings,
 			    const size_t *    lengths,
-			    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_0
+			    cl_int *          errcode_ret)
 {
 	cl_program p;
 	struct cpws_data *data;

socl/src/cl_createsampler.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,12 +18,13 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_sampler CL_API_CALL
 soclCreateSampler(cl_context          UNUSED(context),
 		  cl_bool             UNUSED(normalized_coords), 
 		  cl_addressing_mode  UNUSED(addressing_mode), 
 		  cl_filter_mode      UNUSED(filter_mode),
-		  cl_int *            errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		  cl_int *            errcode_ret)
 {
 	if (errcode_ret != NULL)
 		*errcode_ret = CL_INVALID_OPERATION;

socl/src/cl_enqueuebarrier.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclEnqueueBarrier(cl_command_queue cq) CL_API_SUFFIX__VERSION_1_0
+soclEnqueueBarrier(cl_command_queue cq)
 {
 	command_barrier cmd = command_barrier_create();
 

socl/src/cl_enqueuebarrierwithwaitlist.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2017                                     CNRS
- * Copyright (C) 2010,2013                                Université de Bordeaux
+ * Copyright (C) 2010,2013, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,11 +17,12 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_2
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueBarrierWithWaitList(cl_command_queue  cq,
 			       cl_uint num_events,
 			       const cl_event * events,
-			       cl_event *          event) CL_API_SUFFIX__VERSION_1_2
+			       cl_event *          event)
 {
 	command_barrier cmd = command_barrier_create();
 

socl/src/cl_enqueuecopybuffer.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2016-2017                           CNRS
- * Copyright (C) 2010-2011,2013-2014,2017                 Université de Bordeaux
+ * Copyright (C) 2010-2011,2013-2014,2017-2018                 Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -99,6 +99,7 @@ cl_int command_copy_buffer_submit(command_copy_buffer cmd)
 	return CL_SUCCESS;
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueCopyBuffer(cl_command_queue  cq,
 		      cl_mem              src_buffer,
@@ -108,7 +109,7 @@ soclEnqueueCopyBuffer(cl_command_queue  cq,
 		      size_t              cb,
 		      cl_uint             num_events,
 		      const cl_event *    events,
-		      cl_event *          event) CL_API_SUFFIX__VERSION_1_0
+		      cl_event *          event)
 {
 	command_copy_buffer cmd = command_copy_buffer_create(src_buffer, dst_buffer, src_offset, dst_offset, cb);
 

socl/src/cl_enqueuecopybuffertoimage.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueCopyBufferToImage(cl_command_queue UNUSED(command_queue),
 			     cl_mem           UNUSED(src_buffer),
@@ -27,7 +28,7 @@ soclEnqueueCopyBufferToImage(cl_command_queue UNUSED(command_queue),
 			     const size_t *   UNUSED(region),
 			     cl_uint          UNUSED(num_events_in_wait_list),
 			     const cl_event * UNUSED(event_wait_list),
-			     cl_event *       UNUSED(event)) CL_API_SUFFIX__VERSION_1_0
+			     cl_event *       UNUSED(event))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_enqueuecopyimage.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueCopyImage(cl_command_queue   UNUSED(command_queue),
 		     cl_mem               UNUSED(src_image),
@@ -27,7 +28,7 @@ soclEnqueueCopyImage(cl_command_queue   UNUSED(command_queue),
 		     const size_t *       UNUSED(region),
 		     cl_uint              UNUSED(num_events_in_wait_list),
 		     const cl_event *     UNUSED(event_wait_list),
-		     cl_event *           UNUSED(event)) CL_API_SUFFIX__VERSION_1_0
+		     cl_event *           UNUSED(event))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_enqueuecopyimagetobuffer.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueCopyImageToBuffer(cl_command_queue UNUSED(command_queue),
 			     cl_mem           UNUSED(src_image),
@@ -27,7 +28,7 @@ soclEnqueueCopyImageToBuffer(cl_command_queue UNUSED(command_queue),
 			     size_t           UNUSED(dst_offset),
 			     cl_uint          UNUSED(num_events_in_wait_list),
 			     const cl_event * UNUSED(event_wait_list),
-			     cl_event *       UNUSED(event)) CL_API_SUFFIX__VERSION_1_0
+			     cl_event *       UNUSED(event))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_enqueuemapbuffer.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012-2013,2017                           CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -45,6 +45,7 @@ cl_int command_map_buffer_submit(command_map_buffer cmd)
 	return CL_SUCCESS;
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY void * CL_API_CALL
 soclEnqueueMapBuffer(cl_command_queue cq,
 		     cl_mem           buffer,
@@ -55,7 +56,7 @@ soclEnqueueMapBuffer(cl_command_queue cq,
 		     cl_uint          num_events,
 		     const cl_event * events,
 		     cl_event *       event,
-		     cl_int *         errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		     cl_int *         errcode_ret)
 {
 	command_map_buffer cmd = command_map_buffer_create(buffer, map_flags, offset, cb);
 

socl/src/cl_enqueuemapimage.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY void * CL_API_CALL
 soclEnqueueMapImage(cl_command_queue  UNUSED(command_queue),
 		    cl_mem            UNUSED(image),
@@ -30,7 +31,7 @@ soclEnqueueMapImage(cl_command_queue  UNUSED(command_queue),
 		    cl_uint           UNUSED(num_events_in_wait_list),
 		    const cl_event *  UNUSED(event_wait_list),
 		    cl_event *        UNUSED(event),
-		    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_0
+		    cl_int *          errcode_ret)
 {
 	if (errcode_ret != NULL)
 		*errcode_ret = CL_INVALID_OPERATION;

socl/src/cl_enqueuemarker.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,9 +18,10 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueMarker(cl_command_queue  cq,
-                cl_event *          event) CL_API_SUFFIX__VERSION_1_0
+                cl_event *          event)
 {
 	if (event == NULL)
 		return CL_INVALID_VALUE;

socl/src/cl_enqueuemarkerwithwaitlist.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2017                                     CNRS
- * Copyright (C) 2010,2013                                Université de Bordeaux
+ * Copyright (C) 2010,2013, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,11 +17,12 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_2
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueMarkerWithWaitList(cl_command_queue  cq,
 			      cl_uint num_events,
 			      const cl_event * events,
-			      cl_event *          event) CL_API_SUFFIX__VERSION_1_2
+			      cl_event *          event)
 {
 	if (events == NULL)
 		return soclEnqueueBarrierWithWaitList(cq, num_events, events, event);

socl/src/cl_enqueuenativekernel.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueNativeKernel(cl_command_queue  UNUSED(command_queue),
 			__attribute__((unused)) void (*user_func)(void *),
@@ -28,7 +29,7 @@ soclEnqueueNativeKernel(cl_command_queue  UNUSED(command_queue),
 			const void **     UNUSED(args_mem_loc),
 			cl_uint           UNUSED(num_events_in_wait_list),
 			const cl_event *  UNUSED(event_wait_list),
-			cl_event *        UNUSED(event)) CL_API_SUFFIX__VERSION_1_0
+			cl_event *        UNUSED(event))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_enqueuendrangekernel.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2014,2016-2017                      CNRS
- * Copyright (C) 2010-2011,2013,2016-2017                 Université de Bordeaux
+ * Copyright (C) 2010-2011,2013,2016-2018                 Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -159,6 +159,7 @@ cl_int command_ndrange_kernel_submit(command_ndrange_kernel cmd)
 	return CL_SUCCESS;
 }
 
+CL_API_SUFFIX__VERSION_1_1
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueNDRangeKernel(cl_command_queue cq,
 			 cl_kernel        kernel,
@@ -168,7 +169,7 @@ soclEnqueueNDRangeKernel(cl_command_queue cq,
 			 const size_t *   local_work_size,
 			 cl_uint          num_events,
 			 const cl_event * events,
-			 cl_event *       event) CL_API_SUFFIX__VERSION_1_1
+			 cl_event *       event)
 {
 	if (kernel->split_func != NULL && !STARPU_PTHREAD_MUTEX_TRYLOCK(&kernel->split_lock))
 	{

socl/src/cl_enqueuereadbuffer.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2016-2017                           CNRS
- * Copyright (C) 2010-2011,2013-2014                      Université de Bordeaux
+ * Copyright (C) 2010-2011,2013-2014, 2018                      Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -102,6 +102,7 @@ cl_int command_read_buffer_submit(command_read_buffer cmd)
 	return CL_SUCCESS;
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueReadBuffer(cl_command_queue  cq,
 		      cl_mem              buffer,
@@ -111,7 +112,7 @@ soclEnqueueReadBuffer(cl_command_queue  cq,
 		      void *              ptr,
 		      cl_uint             num_events,
 		      const cl_event *    events,
-		      cl_event *          event) CL_API_SUFFIX__VERSION_1_0
+		      cl_event *          event)
 {
 	command_read_buffer cmd = command_read_buffer_create(buffer, offset, cb, ptr);
 

socl/src/cl_enqueuereadimage.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueReadImage(cl_command_queue   UNUSED(command_queue),
 		     cl_mem               UNUSED(image),
@@ -29,7 +30,7 @@ soclEnqueueReadImage(cl_command_queue   UNUSED(command_queue),
 		     void *               UNUSED(ptr),
 		     cl_uint              UNUSED(num_events_in_wait_list),
 		     const cl_event *     UNUSED(event_wait_list),
-		     cl_event *           UNUSED(event)) CL_API_SUFFIX__VERSION_1_0
+		     cl_event *           UNUSED(event))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_enqueuetask.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,12 +18,13 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueTask(cl_command_queue cq,
 		cl_kernel         kernel,
 		cl_uint           num_events,
 		const cl_event *  events,
-		cl_event *        event) CL_API_SUFFIX__VERSION_1_0
+		cl_event *        event)
 {
 	command_ndrange_kernel cmd = command_task_create(kernel);
 

socl/src/cl_enqueueunmapmemobject.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -32,13 +32,14 @@ cl_int command_unmap_mem_object_submit(command_unmap_mem_object cmd)
 	return CL_SUCCESS;
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueUnmapMemObject(cl_command_queue cq,
 			  cl_mem            buffer,
 			  void *            ptr,
 			  cl_uint           num_events,
 			  const cl_event *  events,
-			  cl_event *        event) CL_API_SUFFIX__VERSION_1_0
+			  cl_event *        event)
 {
 	command_unmap_mem_object cmd = command_unmap_mem_object_create(buffer, ptr);
 

socl/src/cl_enqueuewaitforevents.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,10 +18,11 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueWaitForEvents(cl_command_queue cq,
 			 cl_uint          num_events,
-			 const cl_event * events) CL_API_SUFFIX__VERSION_1_0
+			 const cl_event * events)
 {
 	command_marker cmd = command_marker_create();
 

socl/src/cl_enqueuewritebuffer.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2016-2017                           CNRS
- * Copyright (C) 2010-2011,2013-2014                      Université de Bordeaux
+ * Copyright (C) 2010-2011,2013-2014, 2018                      Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -127,6 +127,7 @@ cl_int command_write_buffer_submit(command_write_buffer cmd)
 	return CL_SUCCESS;
 }
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueWriteBuffer(cl_command_queue cq,
 		       cl_mem             buffer,
@@ -136,7 +137,7 @@ soclEnqueueWriteBuffer(cl_command_queue cq,
 		       const void *       ptr,
 		       cl_uint            num_events,
 		       const cl_event *   events,
-		       cl_event *         event) CL_API_SUFFIX__VERSION_1_0
+		       cl_event *         event)
 {
 	command_write_buffer cmd = command_write_buffer_create(buffer, offset, cb, ptr);
 

socl/src/cl_enqueuewriteimage.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclEnqueueWriteImage(cl_command_queue  UNUSED(command_queue),
 		      cl_mem              UNUSED(image),
@@ -29,7 +30,7 @@ soclEnqueueWriteImage(cl_command_queue  UNUSED(command_queue),
 		      const void *        UNUSED(ptr),
 		      cl_uint             UNUSED(num_events_in_wait_list),
 		      const cl_event *    UNUSED(event_wait_list),
-		      cl_event *          UNUSED(event)) CL_API_SUFFIX__VERSION_1_0
+		      cl_event *          UNUSED(event))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_finish.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclFinish(cl_command_queue cq) CL_API_SUFFIX__VERSION_1_0
+soclFinish(cl_command_queue cq)
 {
 	command_barrier cmd = command_barrier_create();
 

socl/src/cl_flush.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclFlush(cl_command_queue UNUSED(command_queue)) CL_API_SUFFIX__VERSION_1_0
+soclFlush(cl_command_queue UNUSED(command_queue))
 {
 	return CL_SUCCESS;
 }

socl/src/cl_getcommandqueueinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetCommandQueueInfo(cl_command_queue    cq,
 			cl_command_queue_info param_name,
 			size_t                param_value_size,
 			void *                param_value,
-			size_t *              param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+			size_t *              param_value_size_ret)
 {
 	if (cq == NULL)
 		return CL_INVALID_COMMAND_QUEUE;

socl/src/cl_getcontextinfo.c

@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetContextInfo(cl_context       context,
 		   cl_context_info    param_name,
 		   size_t             param_value_size,
 		   void *             param_value,
-		   size_t *           param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+		   size_t *           param_value_size_ret)
 {
 	if (context == NULL)
 		return CL_INVALID_CONTEXT;

socl/src/cl_getdeviceids.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2012,2016                           Université de Bordeaux
+ * Copyright (C) 2010-2012,2016, 2018                           Université de Bordeaux
  * Copyright (C) 2012                                     Vincent Danjean
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -25,12 +25,13 @@
  *
  * \param[in] platform Must be StarPU platform ID or NULL
  */
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetDeviceIDs(cl_platform_id   platform,
 		 cl_device_type   device_type,
 		 cl_uint          num_entries,
 		 cl_device_id *   devices,
-		 cl_uint *        num_devices) CL_API_SUFFIX__VERSION_1_0
+		 cl_uint *        num_devices)
 {
 	if (socl_init_starpu() < 0)
 	{

socl/src/cl_getdeviceinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetDeviceInfo(cl_device_id    device,
 		  cl_device_info  param_name,
 		  size_t          param_value_size,
 		  void *          param_value,
-		  size_t *        param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+		  size_t *        param_value_size_ret)
 {
 	//FIXME: we do not check if the device is valid
 	/* if (device != &socl_virtual_device && device is not a valid StarPU worker identifier)

socl/src/cl_geteventinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetEventInfo(cl_event       event,
 		 cl_event_info    param_name,
 		 size_t           param_value_size,
 		 void *           param_value,
-		 size_t *         param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+		 size_t *         param_value_size_ret)
 {
 	if (event == NULL)
 		return CL_INVALID_EVENT;

socl/src/cl_geteventprofilinginfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetEventProfilingInfo(cl_event          event,
 			  cl_profiling_info   param_name,
 			  size_t              param_value_size,
 			  void *              param_value,
-			  size_t *            param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+			  size_t *            param_value_size_ret)
 {
 	switch (param_name)
 	{

socl/src/cl_getextensionfunctionaddress.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2012                                Université de Bordeaux
+ * Copyright (C) 2010-2012, 2018                                Université de Bordeaux
  * Copyright (C) 2012                                     Vincent Danjean
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -21,8 +21,9 @@
 #include "socl.h"
 #include "init.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY void * CL_API_CALL
-soclGetExtensionFunctionAddress(const char * func_name) CL_API_SUFFIX__VERSION_1_0
+soclGetExtensionFunctionAddress(const char * func_name)
 {
 	if (func_name != NULL && strcmp(func_name, "clShutdown") == 0)
 	{

socl/src/cl_getimageinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetImageInfo(cl_mem           UNUSED(image),
 		 cl_image_info    UNUSED(param_name),
 		 size_t           UNUSED(param_value_size),
 		 void *           UNUSED(param_value),
-		 size_t *         UNUSED(param_value_size_ret)) CL_API_SUFFIX__VERSION_1_0
+		 size_t *         UNUSED(param_value_size_ret))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_getkernelinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetKernelInfo(cl_kernel       kernel,
 		  cl_kernel_info  param_name,
 		  size_t          param_value_size,
 		  void *          param_value,
-		  size_t *        param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+		  size_t *        param_value_size_ret)
 {
 	if (kernel == NULL)
 		return CL_INVALID_KERNEL;

socl/src/cl_getkernelworkgroupinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,13 +18,14 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetKernelWorkGroupInfo(cl_kernel                kernel,
 			   cl_device_id               device,
 			   cl_kernel_work_group_info  param_name,
 			   size_t                     param_value_size,
 			   void *                     param_value,
-			   size_t *                   param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+			   size_t *                   param_value_size_ret)
 {
 	int range = starpu_worker_get_range_by_id(device->worker_id);
 	cl_device_id dev;

socl/src/cl_getmemobjectinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetMemObjectInfo(cl_mem           mem,
 		     cl_mem_info      param_name,
 		     size_t           param_value_size,
 		     void *           param_value,
-		     size_t *         param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+		     size_t *         param_value_size_ret)
 {
 	static cl_mem_object_type mot = CL_MEM_OBJECT_BUFFER;
 

socl/src/cl_getplatformids.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -23,10 +23,11 @@ extern int _starpu_init_failed;
 /**
  * \brief Get StarPU platform ID
  */
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetPlatformIDs(cl_uint          num_entries,
 		   cl_platform_id * platforms,
-		   cl_uint *        num_platforms) CL_API_SUFFIX__VERSION_1_0
+		   cl_uint *        num_platforms)
 {
 	if (_starpu_init_failed)
 	{

socl/src/cl_getplatforminfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011-2012                                Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2012                                Université de Bordeaux
+ * Copyright (C) 2010-2012, 2018                                Université de Bordeaux
  * Copyright (C) 2012                                     Vincent Danjean
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -25,12 +25,13 @@
  *
  * \param[in] platform StarPU platform ID or NULL
  */
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetPlatformInfo(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
+		    size_t *         param_value_size_ret)
 {
 	if (platform != NULL && platform != &socl_platform)
 		return CL_INVALID_PLATFORM;

socl/src/cl_getprogrambuildinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,13 +19,14 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetProgramBuildInfo(cl_program          program,
 			cl_device_id          UNUSED(device),
 			cl_program_build_info param_name,
 			size_t                param_value_size,
 			void *                param_value,
-			size_t *              param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+			size_t *              param_value_size_ret)
 {
 	if (program == NULL)
 		return CL_INVALID_PROGRAM;

socl/src/cl_getprograminfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetProgramInfo(cl_program       program,
 		   cl_program_info    param_name,
 		   size_t             param_value_size,
 		   void *             param_value,
-		   size_t *           param_value_size_ret) CL_API_SUFFIX__VERSION_1_0
+		   size_t *           param_value_size_ret)
 {
 	if (program == NULL)
 		return CL_INVALID_PROGRAM;

socl/src/cl_getsamplerinfo.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,12 +19,13 @@
 #include "socl.h"
 #include "getinfo.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetSamplerInfo(cl_sampler       UNUSED(sampler),
 		   cl_sampler_info    UNUSED(param_name),
 		   size_t             UNUSED(param_value_size),
 		   void *             UNUSED(param_value),
-		   size_t *           UNUSED(param_value_size_ret)) CL_API_SUFFIX__VERSION_1_0
+		   size_t *           UNUSED(param_value_size_ret))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_getsupportedimageformats.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,13 +18,14 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclGetSupportedImageFormats(cl_context           UNUSED(context),
 			     cl_mem_flags         UNUSED(flags),
 			     cl_mem_object_type   UNUSED(image_type),
 			     cl_uint              UNUSED(num_entries),
 			     cl_image_format *    UNUSED(image_formats),
-			     cl_uint *            UNUSED(num_image_formats)) CL_API_SUFFIX__VERSION_1_0
+			     cl_uint *            UNUSED(num_image_formats))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_icdgetplatformidskhr.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2012                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2012                                Université de Bordeaux
+ * Copyright (C) 2010-2012, 2018                                Université de Bordeaux
  * Copyright (C) 2012                                     Vincent Danjean
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -21,9 +21,10 @@
 
 extern int _starpu_init_failed;
 
+CL_EXT_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL soclIcdGetPlatformIDsKHR(cl_uint num_entries,
 							 cl_platform_id *platforms,
-							 cl_uint *num_platforms) CL_EXT_SUFFIX__VERSION_1_0
+							 cl_uint *num_platforms)
 {
 	if ((num_entries == 0 && platforms != NULL)
 	    || (num_platforms == NULL && platforms == NULL))

socl/src/cl_releasecommandqueue.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclReleaseCommandQueue(cl_command_queue cq) CL_API_SUFFIX__VERSION_1_0
+soclReleaseCommandQueue(cl_command_queue cq)
 {
 	gc_entity_release(cq);
 

socl/src/cl_releasecontext.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclReleaseContext(cl_context context) CL_API_SUFFIX__VERSION_1_0
+soclReleaseContext(cl_context context)
 {
 	if (context == NULL)
 		return CL_INVALID_CONTEXT;

socl/src/cl_releaseevent.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclReleaseEvent(cl_event event) CL_API_SUFFIX__VERSION_1_0
+soclReleaseEvent(cl_event event)
 {
 	if (event == NULL)
 		return CL_INVALID_EVENT;

socl/src/cl_releasekernel.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclReleaseKernel(cl_kernel kernel) CL_API_SUFFIX__VERSION_1_0
+soclReleaseKernel(cl_kernel kernel)
 {
 	if (kernel == NULL)
 		return CL_INVALID_KERNEL;

socl/src/cl_releasememobject.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclReleaseMemObject(cl_mem mem) CL_API_SUFFIX__VERSION_1_0
+soclReleaseMemObject(cl_mem mem)
 {
 	gc_entity_release(mem);
 

socl/src/cl_releaseprogram.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclReleaseProgram(cl_program program) CL_API_SUFFIX__VERSION_1_0
+soclReleaseProgram(cl_program program)
 {
 	if (program == NULL)
 		return CL_INVALID_PROGRAM;

socl/src/cl_releasesampler.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclReleaseSampler(cl_sampler UNUSED(sampler)) CL_API_SUFFIX__VERSION_1_0
+soclReleaseSampler(cl_sampler UNUSED(sampler))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_retaincommandqueue.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclRetainCommandQueue(cl_command_queue cq) CL_API_SUFFIX__VERSION_1_0
+soclRetainCommandQueue(cl_command_queue cq)
 {
 	if (cq == NULL)
 	   return CL_INVALID_COMMAND_QUEUE;

socl/src/cl_retaincontext.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclRetainContext(cl_context context) CL_API_SUFFIX__VERSION_1_0
+soclRetainContext(cl_context context)
 {
 	if (context == NULL)
 	   return CL_INVALID_CONTEXT;

socl/src/cl_retainevent.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclRetainEvent(cl_event event) CL_API_SUFFIX__VERSION_1_0
+soclRetainEvent(cl_event event)
 {
 	if (event == NULL)
 		return CL_INVALID_EVENT;

socl/src/cl_retainkernel.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclRetainKernel(cl_kernel    kernel) CL_API_SUFFIX__VERSION_1_0
+soclRetainKernel(cl_kernel    kernel)
 {
 	if (kernel == NULL)
 		return CL_INVALID_KERNEL;

socl/src/cl_retainmemobject.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclRetainMemObject(cl_mem mem) CL_API_SUFFIX__VERSION_1_0
+soclRetainMemObject(cl_mem mem)
 {
 	if (mem == NULL)
 		return CL_INVALID_MEM_OBJECT;

socl/src/cl_retainprogram.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclRetainProgram(cl_program program) CL_API_SUFFIX__VERSION_1_0
+soclRetainProgram(cl_program program)
 {
 	if (program == NULL)
 		return CL_INVALID_PROGRAM;

socl/src/cl_retainsampler.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclRetainSampler(cl_sampler UNUSED(sampler)) CL_API_SUFFIX__VERSION_1_0
+soclRetainSampler(cl_sampler UNUSED(sampler))
 {
 	return CL_INVALID_OPERATION;
 }

socl/src/cl_setcommandqueueproperty.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,11 +18,12 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclSetCommandQueueProperty(cl_command_queue            command_queue,
 			    cl_command_queue_properties   properties,
 			    cl_bool                       enable,
-			    cl_command_queue_properties * old_properties) CL_API_SUFFIX__VERSION_1_0
+			    cl_command_queue_properties * old_properties)
 {
 	if (command_queue == NULL)
 		return CL_INVALID_COMMAND_QUEUE;

socl/src/cl_setkernelarg.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011,2013                           Université de Bordeaux
+ * Copyright (C) 2010-2011,2013, 2018                           Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,11 +18,12 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclSetKernelArg(cl_kernel  kernel,
 		 cl_uint      arg_index,
 		 size_t       arg_size,
-		 const void * arg_value) CL_API_SUFFIX__VERSION_1_0
+		 const void * arg_value)
 {
 	if (kernel == NULL)
 		return CL_INVALID_KERNEL;

socl/src/cl_unloadcompiler.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2011                                Université de Bordeaux
+ * Copyright (C) 2010-2011, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,8 +18,9 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
-soclUnloadCompiler(void) CL_API_SUFFIX__VERSION_1_0
+soclUnloadCompiler(void)
 {
 	return CL_SUCCESS;
 }

socl/src/cl_waitforevents.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Inria
  * Copyright (C) 2012,2017                                CNRS
- * Copyright (C) 2010-2013                                Université de Bordeaux
+ * Copyright (C) 2010-2013, 2018                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,9 +18,10 @@
 
 #include "socl.h"
 
+CL_API_SUFFIX__VERSION_1_0
 CL_API_ENTRY cl_int CL_API_CALL
 soclWaitForEvents(cl_uint           num_events,
-                const cl_event *    event_list) CL_API_SUFFIX__VERSION_1_0
+                const cl_event *    event_list)
 {
 	unsigned int i;