diff --git a/ChangeLog b/ChangeLog
index 6f8425386..0c0b89efb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-12-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gthreadpool.h:
+	* glib/gthreadpool.c (g_thread_pool_free): Don't use "wait"
+	as parameter name.  (#379207, Christian Biere)
+
 	* glib/gspawn.c: Refer to g_child_watch_add() in addition
 	to waitpid().
 
diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c
index b136405e0..ec50609b1 100644
--- a/glib/gthreadpool.c
+++ b/glib/gthreadpool.c
@@ -649,7 +649,7 @@ g_thread_pool_unprocessed (GThreadPool *pool)
  * g_thread_pool_free:
  * @pool: a #GThreadPool
  * @immediate: should @pool shut down immediately?
- * @wait: should the function wait for all tasks to be finished?
+ * @wait_: should the function wait for all tasks to be finished?
  *
  * Frees all resources allocated for @pool.
  *
@@ -659,7 +659,7 @@ g_thread_pool_unprocessed (GThreadPool *pool)
  * interrupted, while processing a task. Instead at least all still
  * running threads can finish their tasks before the @pool is freed.
  *
- * If @wait is %TRUE, the functions does not return before all tasks
+ * If @wait_ is %TRUE, the functions does not return before all tasks
  * to be processed (dependent on @immediate, whether all or only the
  * currently running) are ready. Otherwise the function returns immediately.
  *
@@ -668,7 +668,7 @@ g_thread_pool_unprocessed (GThreadPool *pool)
 void
 g_thread_pool_free (GThreadPool *pool,
 		    gboolean     immediate,
-		    gboolean     wait)
+		    gboolean     wait_)
 {
   GRealThreadPool *real;
 
@@ -688,9 +688,9 @@ g_thread_pool_free (GThreadPool *pool,
 
   real->running = FALSE;
   real->immediate = immediate;
-  real->waiting = wait;
+  real->waiting = wait_;
 
-  if (wait)
+  if (wait_)
     {
       real->cond = g_cond_new ();
 
diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h
index 371b9ef1e..91a02d6ae 100644
--- a/glib/gthreadpool.h
+++ b/glib/gthreadpool.h
@@ -85,7 +85,7 @@ guint           g_thread_pool_unprocessed     (GThreadPool     *pool);
  * does however not mean, that threads are killed. */
 void            g_thread_pool_free            (GThreadPool     *pool,
                                                gboolean         immediate,
-                                               gboolean         wait);
+                                               gboolean         wait_);
 
 /* Set the maximal number of unused threads before threads will be stopped by
  * GLib, -1 means no limit */