llvmpipe: fix symbol conflict on Haiku
authorAlexander von Gluck <kallisti5@unixzen.com>
Sun, 22 Jan 2012 18:42:17 +0000 (12:42 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 24 Jan 2012 18:00:40 +0000 (11:00 -0700)
NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Brian Paul <brianp@vmware.com>
src/gallium/drivers/llvmpipe/lp_rast.c

index 873c2612e89aaaa0b45c468373cdba0987a7b91f..efa5024717ef6d975d959ec6fdfe82eb63748369 100644 (file)
@@ -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]);
    }
 }