rename variable interface (on windows, when including <windows.h>, one gets #define interface struct, ...)

src/datawizard/interfaces/bcsr_interface.c

@@ -115,7 +115,7 @@ void starpu_bcsr_data_register(starpu_data_handle *handleptr, uint32_t home_node
 		uint32_t *rowptr, uint32_t firstentry,
 		uint32_t r, uint32_t c, size_t elemsize)
 {
-	starpu_bcsr_interface_t interface = {
+	starpu_bcsr_interface_t bcsr_interface = {
 		.nzval = nzval,
 		.colind = colind,
 		.rowptr = rowptr,
@@ -127,7 +127,7 @@ void starpu_bcsr_data_register(starpu_data_handle *handleptr, uint32_t home_node
 		.elemsize = elemsize
 	};
 
-	starpu_data_register(handleptr, home_node, &interface, &interface_bcsr_ops);
+	starpu_data_register(handleptr, home_node, &bcsr_interface, &interface_bcsr_ops);
 }
 
 static uint32_t footprint_bcsr_interface_crc32(starpu_data_handle handle)
@@ -157,50 +157,50 @@ static int bcsr_compare(void *data_interface_a, void *data_interface_b)
 /* offer an access to the data parameters */
 uint32_t starpu_bcsr_get_nnz(starpu_data_handle handle)
 {
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->nnz;
+	return data_interface->nnz;
 }
 
 uint32_t starpu_bcsr_get_nrow(starpu_data_handle handle)
 {
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->nrow;
+	return data_interface->nrow;
 }
 
 uint32_t starpu_bcsr_get_firstentry(starpu_data_handle handle)
 {
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->firstentry;
+	return data_interface->firstentry;
 }
 
 uint32_t starpu_bcsr_get_r(starpu_data_handle handle)
 {
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->r;
+	return data_interface->r;
 }
 
 uint32_t starpu_bcsr_get_c(starpu_data_handle handle)
 {
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->c;
+	return data_interface->c;
 }
 
 size_t starpu_bcsr_get_elemsize(starpu_data_handle handle)
 {
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->elemsize;
+	return data_interface->elemsize;
 }
 
 uintptr_t starpu_bcsr_get_local_nzval(starpu_data_handle handle)
@@ -210,28 +210,28 @@ uintptr_t starpu_bcsr_get_local_nzval(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, node);
 	
-	return interface->nzval;
+	return data_interface->nzval;
 }
 
 uint32_t *starpu_bcsr_get_local_colind(starpu_data_handle handle)
 {
 	/* XXX 0 */
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->colind;
+	return data_interface->colind;
 }
 
 uint32_t *starpu_bcsr_get_local_rowptr(starpu_data_handle handle)
 {
 	/* XXX 0 */
-	starpu_bcsr_interface_t *interface =
+	starpu_bcsr_interface_t *data_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->rowptr;
+	return data_interface->rowptr;
 }
 
 
@@ -261,14 +261,14 @@ static ssize_t allocate_bcsr_buffer_on_node(void *data_interface_, uint32_t dst_
 	ssize_t allocated_memory;
 
 	/* we need the 3 arrays to be allocated */
-	starpu_bcsr_interface_t *interface = data_interface_;
+	starpu_bcsr_interface_t *bcsr_interface = data_interface_;
 
-	uint32_t nnz = interface->nnz;
-	uint32_t nrow = interface->nrow;
-	size_t elemsize = interface->elemsize;
+	uint32_t nnz = bcsr_interface->nnz;
+	uint32_t nrow = bcsr_interface->nrow;
+	size_t elemsize = bcsr_interface->elemsize;
 
-	uint32_t r = interface->r;
-	uint32_t c = interface->c;
+	uint32_t r = bcsr_interface->r;
+	uint32_t c = bcsr_interface->c;
 
 	starpu_node_kind kind = _starpu_get_node_kind(dst_node);
 
@@ -333,9 +333,9 @@ static ssize_t allocate_bcsr_buffer_on_node(void *data_interface_, uint32_t dst_
 		nnz*r*c*elemsize + nnz*sizeof(uint32_t) + (nrow+1)*sizeof(uint32_t);
 
 	/* update the data properly in consequence */
-	interface->nzval = addr_nzval;
-	interface->colind = addr_colind;
-	interface->rowptr = addr_rowptr;
+	bcsr_interface->nzval = addr_nzval;
+	bcsr_interface->colind = addr_colind;
+	bcsr_interface->rowptr = addr_rowptr;
 	
 	return allocated_memory;
 

src/datawizard/interfaces/block_interface.c

@@ -139,7 +139,7 @@ void starpu_block_data_register(starpu_data_handle *handleptr, uint32_t home_nod
 			uintptr_t ptr, uint32_t ldy, uint32_t ldz, uint32_t nx,
 			uint32_t ny, uint32_t nz, size_t elemsize)
 {
-	starpu_block_interface_t interface = {
+	starpu_block_interface_t block_interface = {
 		.ptr = ptr,
                 .dev_handle = ptr,
                 .offset = 0,
@@ -151,7 +151,7 @@ void starpu_block_data_register(starpu_data_handle *handleptr, uint32_t home_nod
 		.elemsize = elemsize
 	};
 
-	starpu_data_register(handleptr, home_node, &interface, &interface_block_ops);
+	starpu_data_register(handleptr, home_node, &block_interface, &interface_block_ops);
 }
 
 static uint32_t footprint_block_interface_crc32(starpu_data_handle handle)
@@ -179,21 +179,21 @@ static int block_compare(void *data_interface_a, void *data_interface_b)
 
 static void display_block_interface(starpu_data_handle handle, FILE *f)
 {
-	starpu_block_interface_t *interface;
+	starpu_block_interface_t *block_interface;
 
-	interface = starpu_data_get_interface_on_node(handle, 0);
+	block_interface = starpu_data_get_interface_on_node(handle, 0);
 
-	fprintf(f, "%u\t%u\t%u\t", interface->nx, interface->ny, interface->nz);
+	fprintf(f, "%u\t%u\t%u\t", block_interface->nx, block_interface->ny, block_interface->nz);
 }
 
 static size_t block_interface_get_size(starpu_data_handle handle)
 {
 	size_t size;
-	starpu_block_interface_t *interface;
+	starpu_block_interface_t *block_interface;
 
-	interface = starpu_data_get_interface_on_node(handle, 0);
+	block_interface = starpu_data_get_interface_on_node(handle, 0);
 
-	size = interface->nx*interface->ny*interface->nz*interface->elemsize; 
+	size = block_interface->nx*block_interface->ny*block_interface->nz*block_interface->elemsize; 
 
 	return size;
 }
@@ -201,26 +201,26 @@ static size_t block_interface_get_size(starpu_data_handle handle)
 /* offer an access to the data parameters */
 uint32_t starpu_block_get_nx(starpu_data_handle handle)
 {
-	starpu_block_interface_t *interface =
+	starpu_block_interface_t *block_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->nx;
+	return block_interface->nx;
 }
 
 uint32_t starpu_block_get_ny(starpu_data_handle handle)
 {
-	starpu_block_interface_t *interface =
+	starpu_block_interface_t *block_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->ny;
+	return block_interface->ny;
 }
 
 uint32_t starpu_block_get_nz(starpu_data_handle handle)
 {
-	starpu_block_interface_t *interface =
+	starpu_block_interface_t *block_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->nz;
+	return block_interface->nz;
 }
 
 uint32_t starpu_block_get_local_ldy(starpu_data_handle handle)
@@ -230,10 +230,10 @@ uint32_t starpu_block_get_local_ldy(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 	
-	starpu_block_interface_t *interface =
+	starpu_block_interface_t *block_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->ldy;
+	return block_interface->ldy;
 }
 
 uint32_t starpu_block_get_local_ldz(starpu_data_handle handle)
@@ -243,10 +243,10 @@ uint32_t starpu_block_get_local_ldz(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_block_interface_t *interface =
+	starpu_block_interface_t *block_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->ldz;
+	return block_interface->ldz;
 }
 
 uintptr_t starpu_block_get_local_ptr(starpu_data_handle handle)
@@ -256,18 +256,18 @@ uintptr_t starpu_block_get_local_ptr(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_block_interface_t *interface =
+	starpu_block_interface_t *block_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->ptr;
+	return block_interface->ptr;
 }
 
 size_t starpu_block_get_elemsize(starpu_data_handle handle)
 {
-	starpu_block_interface_t *interface =
+	starpu_block_interface_t *block_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->elemsize;
+	return block_interface->elemsize;
 }
 
 

src/datawizard/interfaces/csr_interface.c

@@ -108,7 +108,7 @@ static void register_csr_handle(starpu_data_handle handle, uint32_t home_node, v
 void starpu_csr_data_register(starpu_data_handle *handleptr, uint32_t home_node,
 		uint32_t nnz, uint32_t nrow, uintptr_t nzval, uint32_t *colind, uint32_t *rowptr, uint32_t firstentry, size_t elemsize)
 {
-	starpu_csr_interface_t interface = {
+	starpu_csr_interface_t csr_interface = {
 		.nnz = nnz,
 		.nrow = nrow,
 		.nzval = nzval,
@@ -118,7 +118,7 @@ void starpu_csr_data_register(starpu_data_handle *handleptr, uint32_t home_node,
 		.elemsize = elemsize
 	};
 
-	starpu_data_register(handleptr, home_node, &interface, &interface_csr_ops);
+	starpu_data_register(handleptr, home_node, &csr_interface, &interface_csr_ops);
 }
 
 static uint32_t footprint_csr_interface_crc32(starpu_data_handle handle)
@@ -140,34 +140,34 @@ static int csr_compare(void *data_interface_a, void *data_interface_b)
 /* offer an access to the data parameters */
 uint32_t starpu_csr_get_nnz(starpu_data_handle handle)
 {
-	starpu_csr_interface_t *interface =
+	starpu_csr_interface_t *csr_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->nnz;
+	return csr_interface->nnz;
 }
 
 uint32_t starpu_csr_get_nrow(starpu_data_handle handle)
 {
-	starpu_csr_interface_t *interface =
+	starpu_csr_interface_t *csr_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->nrow;
+	return csr_interface->nrow;
 }
 
 uint32_t starpu_csr_get_firstentry(starpu_data_handle handle)
 {
-	starpu_csr_interface_t *interface =
+	starpu_csr_interface_t *csr_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->firstentry;
+	return csr_interface->firstentry;
 }
 
 size_t starpu_csr_get_elemsize(starpu_data_handle handle)
 {
-	starpu_csr_interface_t *interface =
+	starpu_csr_interface_t *csr_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->elemsize;
+	return csr_interface->elemsize;
 }
 
 uintptr_t starpu_csr_get_local_nzval(starpu_data_handle handle)
@@ -177,10 +177,10 @@ uintptr_t starpu_csr_get_local_nzval(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_csr_interface_t *interface =
+	starpu_csr_interface_t *csr_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->nzval;
+	return csr_interface->nzval;
 }
 
 uint32_t *starpu_csr_get_local_colind(starpu_data_handle handle)
@@ -190,10 +190,10 @@ uint32_t *starpu_csr_get_local_colind(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_csr_interface_t *interface =
+	starpu_csr_interface_t *csr_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->colind;
+	return csr_interface->colind;
 }
 
 uint32_t *starpu_csr_get_local_rowptr(starpu_data_handle handle)
@@ -203,10 +203,10 @@ uint32_t *starpu_csr_get_local_rowptr(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_csr_interface_t *interface =
+	starpu_csr_interface_t *csr_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->rowptr;
+	return csr_interface->rowptr;
 }
 
 static size_t csr_interface_get_size(starpu_data_handle handle)
@@ -232,11 +232,11 @@ static ssize_t allocate_csr_buffer_on_node(void *data_interface_, uint32_t dst_n
 	ssize_t allocated_memory;
 
 	/* we need the 3 arrays to be allocated */
-	starpu_csr_interface_t *interface = data_interface_;
+	starpu_csr_interface_t *csr_interface = data_interface_;
 
-	uint32_t nnz = interface->nnz;
-	uint32_t nrow = interface->nrow;
-	size_t elemsize = interface->elemsize;
+	uint32_t nnz = csr_interface->nnz;
+	uint32_t nrow = csr_interface->nrow;
+	size_t elemsize = csr_interface->elemsize;
 
 	starpu_node_kind kind = _starpu_get_node_kind(dst_node);
 
@@ -301,9 +301,9 @@ static ssize_t allocate_csr_buffer_on_node(void *data_interface_, uint32_t dst_n
 		nnz*elemsize + nnz*sizeof(uint32_t) + (nrow+1)*sizeof(uint32_t);
 
 	/* update the data properly in consequence */
-	interface->nzval = addr_nzval;
-	interface->colind = addr_colind;
-	interface->rowptr = addr_rowptr;
+	csr_interface->nzval = addr_nzval;
+	csr_interface->colind = addr_colind;
+	csr_interface->rowptr = addr_rowptr;
 	
 	return allocated_memory;
 

src/datawizard/interfaces/matrix_interface.c

@@ -141,7 +141,7 @@ void starpu_matrix_data_register(starpu_data_handle *handleptr, uint32_t home_no
 			uintptr_t ptr, uint32_t ld, uint32_t nx,
 			uint32_t ny, size_t elemsize)
 {
-	starpu_matrix_interface_t interface = {
+	starpu_matrix_interface_t matrix_interface = {
 		.ptr = ptr,
 		.ld = ld,
 		.nx = nx,
@@ -151,7 +151,7 @@ void starpu_matrix_data_register(starpu_data_handle *handleptr, uint32_t home_no
                 .offset = 0
 	};
 
-	starpu_data_register(handleptr, home_node, &interface, &_starpu_interface_matrix_ops);
+	starpu_data_register(handleptr, home_node, &matrix_interface, &_starpu_interface_matrix_ops);
 }
 
 static uint32_t footprint_matrix_interface_crc32(starpu_data_handle handle)
@@ -172,19 +172,19 @@ static int matrix_compare(void *data_interface_a, void *data_interface_b)
 
 static void display_matrix_interface(starpu_data_handle handle, FILE *f)
 {
-	starpu_matrix_interface_t *interface =
+	starpu_matrix_interface_t *matrix_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	fprintf(f, "%u\t%u\t", interface->nx, interface->ny);
+	fprintf(f, "%u\t%u\t", matrix_interface->nx, matrix_interface->ny);
 }
 
 static size_t matrix_interface_get_size(starpu_data_handle handle)
 {
-	starpu_matrix_interface_t *interface =
+	starpu_matrix_interface_t *matrix_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
 	size_t size;
-	size = (size_t)interface->nx*interface->ny*interface->elemsize; 
+	size = (size_t)matrix_interface->nx*matrix_interface->ny*matrix_interface->elemsize; 
 
 	return size;
 }
@@ -192,18 +192,18 @@ static size_t matrix_interface_get_size(starpu_data_handle handle)
 /* offer an access to the data parameters */
 uint32_t starpu_matrix_get_nx(starpu_data_handle handle)
 {
-	starpu_matrix_interface_t *interface =
+	starpu_matrix_interface_t *matrix_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->nx;
+	return matrix_interface->nx;
 }
 
 uint32_t starpu_matrix_get_ny(starpu_data_handle handle)
 {
-	starpu_matrix_interface_t *interface =
+	starpu_matrix_interface_t *matrix_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->ny;
+	return matrix_interface->ny;
 }
 
 uint32_t starpu_matrix_get_local_ld(starpu_data_handle handle)
@@ -213,10 +213,10 @@ uint32_t starpu_matrix_get_local_ld(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_matrix_interface_t *interface =
+	starpu_matrix_interface_t *matrix_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->ld;
+	return matrix_interface->ld;
 }
 
 uintptr_t starpu_matrix_get_local_ptr(starpu_data_handle handle)
@@ -226,18 +226,18 @@ uintptr_t starpu_matrix_get_local_ptr(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_matrix_interface_t *interface =
+	starpu_matrix_interface_t *matrix_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->ptr;
+	return matrix_interface->ptr;
 }
 
 size_t starpu_matrix_get_elemsize(starpu_data_handle handle)
 {
-	starpu_matrix_interface_t *interface =
+	starpu_matrix_interface_t *matrix_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->elemsize;
+	return matrix_interface->elemsize;
 }
 
 /* memory allocation/deallocation primitives for the matrix interface */
@@ -253,12 +253,12 @@ static ssize_t allocate_matrix_buffer_on_node(void *data_interface_, uint32_t ds
 	cudaError_t status;
 #endif
 
-	starpu_matrix_interface_t *interface = data_interface_;
+	starpu_matrix_interface_t *matrix_interface = data_interface_;
 
-	uint32_t nx = interface->nx;
-	uint32_t ny = interface->ny;
+	uint32_t nx = matrix_interface->nx;
+	uint32_t ny = matrix_interface->ny;
 	uint32_t ld = nx; // by default
-	size_t elemsize = interface->elemsize;
+	size_t elemsize = matrix_interface->elemsize;
 
 	starpu_node_kind kind = _starpu_get_node_kind(dst_node);
 
@@ -306,10 +306,10 @@ static ssize_t allocate_matrix_buffer_on_node(void *data_interface_, uint32_t ds
 		allocated_memory = (size_t)nx*ny*elemsize;
 
 		/* update the data properly in consequence */
-		interface->ptr = addr;
-                interface->dev_handle = addr;
-                interface->offset = 0;
-		interface->ld = ld;
+		matrix_interface->ptr = addr;
+                matrix_interface->dev_handle = addr;
+                matrix_interface->offset = 0;
+		matrix_interface->ld = ld;
 	} else {
 		/* allocation failed */
 		allocated_memory = -ENOMEM;

src/datawizard/interfaces/variable_interface.c

@@ -149,18 +149,18 @@ static int variable_compare(void *data_interface_a, void *data_interface_b)
 
 static void display_variable_interface(starpu_data_handle handle, FILE *f)
 {
-	starpu_variable_interface_t *interface =
+	starpu_variable_interface_t *variable_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	fprintf(f, "%ld\t", (long)interface->elemsize);
+	fprintf(f, "%ld\t", (long)variable_interface->elemsize);
 }
 
 static size_t variable_interface_get_size(starpu_data_handle handle)
 {
-	starpu_variable_interface_t *interface =
+	starpu_variable_interface_t *variable_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->elemsize;
+	return variable_interface->elemsize;
 }
 
 uintptr_t starpu_variable_get_local_ptr(starpu_data_handle handle)
@@ -183,13 +183,13 @@ size_t starpu_variable_get_elemsize(starpu_data_handle handle)
 /* returns the size of the allocated area */
 static ssize_t allocate_variable_buffer_on_node(void *data_interface_, uint32_t dst_node)
 {
-	starpu_variable_interface_t *interface = data_interface_;
+	starpu_variable_interface_t *variable_interface = data_interface_;
 
 	unsigned fail = 0;
 	uintptr_t addr = 0;
 	ssize_t allocated_memory;
 
-	size_t elemsize = interface->elemsize;
+	size_t elemsize = variable_interface->elemsize;
 
 	starpu_node_kind kind = _starpu_get_node_kind(dst_node);
 
@@ -239,7 +239,7 @@ static ssize_t allocate_variable_buffer_on_node(void *data_interface_, uint32_t
 	allocated_memory = elemsize;
 
 	/* update the data properly in consequence */
-	interface->ptr = addr;
+	variable_interface->ptr = addr;
 	
 	return allocated_memory;
 }

src/datawizard/interfaces/vector_interface.c

@@ -162,19 +162,19 @@ static int vector_compare(void *data_interface_a, void *data_interface_b)
 
 static void display_vector_interface(starpu_data_handle handle, FILE *f)
 {
-	starpu_vector_interface_t *interface =
+	starpu_vector_interface_t *vector_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	fprintf(f, "%u\t", interface->nx);
+	fprintf(f, "%u\t", vector_interface->nx);
 }
 
 static size_t vector_interface_get_size(starpu_data_handle handle)
 {
 	size_t size;
-	starpu_vector_interface_t *interface =
+	starpu_vector_interface_t *vector_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	size = interface->nx*interface->elemsize;
+	size = vector_interface->nx*vector_interface->elemsize;
 
 	return size;
 }
@@ -182,10 +182,10 @@ static size_t vector_interface_get_size(starpu_data_handle handle)
 /* offer an access to the data parameters */
 uint32_t starpu_vector_get_nx(starpu_data_handle handle)
 {
-	starpu_vector_interface_t *interface =
+	starpu_vector_interface_t *vector_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->nx;
+	return vector_interface->nx;
 }
 
 uintptr_t starpu_vector_get_local_ptr(starpu_data_handle handle)
@@ -195,18 +195,18 @@ uintptr_t starpu_vector_get_local_ptr(starpu_data_handle handle)
 
 	STARPU_ASSERT(starpu_data_test_if_allocated_on_node(handle, node));
 
-	starpu_vector_interface_t *interface =
+	starpu_vector_interface_t *vector_interface =
 		starpu_data_get_interface_on_node(handle, node);
 
-	return interface->ptr;
+	return vector_interface->ptr;
 }
 
 size_t starpu_vector_get_elemsize(starpu_data_handle handle)
 {
-	starpu_vector_interface_t *interface =
+	starpu_vector_interface_t *vector_interface =
 		starpu_data_get_interface_on_node(handle, 0);
 
-	return interface->elemsize;
+	return vector_interface->elemsize;
 }
 
 /* memory allocation/deallocation primitives for the vector interface */
@@ -214,14 +214,14 @@ size_t starpu_vector_get_elemsize(starpu_data_handle handle)
 /* returns the size of the allocated area */
 static ssize_t allocate_vector_buffer_on_node(void *data_interface_, uint32_t dst_node)
 {
-	starpu_vector_interface_t *interface = data_interface_;
+	starpu_vector_interface_t *vector_interface = data_interface_;
 
 	unsigned fail = 0;
 	uintptr_t addr = 0;
 	ssize_t allocated_memory;
 
-	uint32_t nx = interface->nx;
-	size_t elemsize = interface->elemsize;
+	uint32_t nx = vector_interface->nx;
+	size_t elemsize = vector_interface->elemsize;
 
 	starpu_node_kind kind = _starpu_get_node_kind(dst_node);
 
@@ -271,9 +271,9 @@ static ssize_t allocate_vector_buffer_on_node(void *data_interface_, uint32_t ds
 	allocated_memory = nx*elemsize;
 
 	/* update the data properly in consequence */
-	interface->ptr = addr;
-        interface->dev_handle = addr;
-        interface->offset = 0;
+	vector_interface->ptr = addr;
+        vector_interface->dev_handle = addr;
+        vector_interface->offset = 0;
 	
 	return allocated_memory;
 }