src: fix compiler warnings

src/core/combined_workers.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2011  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * 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
@@ -123,6 +123,7 @@ int starpu_combined_worker_assign_workerid(int nworkers, int workerid_array[])
 
 	for (i = 0; i < nworkers; i++)
 	{
+#if defined(__GLIBC__) || defined(STARPU_HAVE_HWLOC)
 		int id = workerid_array[i];
 #ifdef __GLIBC__
 #ifdef CPU_OR
@@ -143,6 +144,7 @@ int starpu_combined_worker_assign_workerid(int nworkers, int workerid_array[])
 				combined_worker->hwloc_cpu_set,
 				config->workers[id].initial_hwloc_cpu_set);
 #endif
+#endif
 	}
 
 	return new_workerid;

src/drivers/driver_common/driver_common.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2011  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * 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
@@ -67,7 +67,6 @@ void _starpu_driver_end_job(struct starpu_worker_s *args, starpu_job_t j, struct
 	int starpu_top=starpu_top_status_get();
 	int workerid = args->workerid;
 	unsigned calibrate_model = 0;
-	enum starpu_perf_archtype archtype = args->perf_arch;
 
 	STARPU_TRACE_END_CODELET_BODY(j, archtype);