aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/posix-threads.cc3
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8d7ddc8..bf48430 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-26 Ben Elliston <bje@au.ibm.com>
+
+ * posix-threads.cc (ParkHelper::unpark): Do not initialise result,
+ but assign it instead. Eliminates an unused variable warning when
+ the result == 0 assertion is disabled.
+
2009-11-17 Andrew Haley <aph@redhat.com>
* posix-threads.cc (park): Rewrite code to handle time.
diff --git a/libjava/posix-threads.cc b/libjava/posix-threads.cc
index a26c3bd..66693ab 100644
--- a/libjava/posix-threads.cc
+++ b/libjava/posix-threads.cc
@@ -365,8 +365,9 @@ ParkHelper::unpark ()
if (compare_and_swap
(ptr, Thread::THREAD_PARK_PARKED, Thread::THREAD_PARK_RUNNING))
{
+ int result;
pthread_mutex_lock (&mutex);
- int result = pthread_cond_signal (&cond);
+ result = pthread_cond_signal (&cond);
pthread_mutex_unlock (&mutex);
JvAssert (result == 0);
}