2010-02-03 Ivan Maidanski <ivmai@mail.ru>

	* src/atomic_ops_stack.c (AO_stack_push_explicit_aux_release):
	Define "i" variable only if used (to suppress a compiler warning).

diff --git a/ChangeLog b/ChangeLog
index afa0ef3f30f8b2d6745b65c8979ab097e3b86b46..63d61614b1ce6fc4669c7311df1c9554b800077b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-03  Ivan Maidanski <ivmai@mail.ru>
+
+       * src/atomic_ops_stack.c (AO_stack_push_explicit_aux_release):
+       Define "i" variable only if used (to suppress a compiler warning).
+
 2010-02-02  Ivan Maidanski <ivmai@mail.ru>
 
        * src/atomic_ops/sysdeps/sunc/x86.h (AO_test_and_set_full): Fix

diff --git a/src/atomic_ops_stack.c b/src/atomic_ops_stack.c
index 6de7a578c569935522010a49e6a09ab0fa2aa4af..2f031454f56bf95b3c1ed5decde6e0acba1c08b7 100644 (file)
--- a/src/atomic_ops_stack.c
+++ b/src/atomic_ops_stack.c
@@ -92,7 +92,6 @@ void
 AO_stack_push_explicit_aux_release(volatile AO_t *list, AO_t *x,
                                    AO_stack_aux *a)
 {
-  int i;
   AO_t x_bits = (AO_t)x;
   AO_t next;
 
@@ -106,7 +105,7 @@ AO_stack_push_explicit_aux_release(volatile AO_t *list, AO_t *x,
     AO_t entry2 = AO_load(a -> AO_stack_bl + 1);
     if (entry1 == x_bits || entry2 == x_bits)
       {
-        /* Entry is currently being removed.  Change it a little.     */
+        /* Entry is currently being removed.  Change it a little.       */
           ++x_bits;
           if ((x_bits & AO_BIT_MASK) == 0)
             /* Version count overflowed;         */
@@ -116,11 +115,13 @@ AO_stack_push_explicit_aux_release(volatile AO_t *list, AO_t *x,
       }
   }
 # else
+  {
+    int i;
     for (i = 0; i < AO_BL_SIZE; ++i)
       {
         if (AO_load(a -> AO_stack_bl + i) == x_bits)
           {
-            /* Entry is currently being removed.  Change it a little.     */
+            /* Entry is currently being removed.  Change it a little.   */
               ++x_bits;
               if ((x_bits & AO_BIT_MASK) == 0)
                 /* Version count overflowed;         */
@@ -129,6 +130,7 @@ AO_stack_push_explicit_aux_release(volatile AO_t *list, AO_t *x,
             goto retry;
           }
       }
+  }
 # endif
   /* x_bits is not currently being deleted */
   do