From: Alexander von Gluck Date: Sun, 22 Jan 2012 18:42:17 +0000 (-0600) Subject: llvmpipe: fix symbol conflict on Haiku X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1550b0668e8914f12ed314d347f59c89ba42c20c;p=mesa.git llvmpipe: fix symbol conflict on Haiku NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Brian Paul --- diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c index 873c2612e89..efa5024717e 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast.c +++ b/src/gallium/drivers/llvmpipe/lp_rast.c @@ -792,7 +792,7 @@ lp_rast_finish( struct lp_rasterizer *rast ) * 2. do work * 3. signal that we're done */ -static PIPE_THREAD_ROUTINE( thread_func, init_data ) +static PIPE_THREAD_ROUTINE( thread_function, init_data ) { struct lp_rasterizer_task *task = (struct lp_rasterizer_task *) init_data; struct lp_rasterizer *rast = task->rast; @@ -860,7 +860,7 @@ create_rast_threads(struct lp_rasterizer *rast) for (i = 0; i < rast->num_threads; i++) { pipe_semaphore_init(&rast->tasks[i].work_ready, 0); pipe_semaphore_init(&rast->tasks[i].work_done, 0); - rast->threads[i] = pipe_thread_create(thread_func, + rast->threads[i] = pipe_thread_create(thread_function, (void *) &rast->tasks[i]); } }