From cd76153a747ebb848dfd57ce059d4df27bcc0b1d Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Mon, 18 Apr 2005 19:52:39 +0000
Subject: [PATCH] * dumb bug fixes

This commit was SVN r5422.
---
 test/asm/atomic_cmpset.c   | 4 +---
 test/asm/atomic_spinlock.c | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/asm/atomic_cmpset.c b/test/asm/atomic_cmpset.c
index c1e2f5d5b3..b684c067fc 100644
--- a/test/asm/atomic_cmpset.c
+++ b/test/asm/atomic_cmpset.c
@@ -70,9 +70,7 @@ static void *thread_main(void *arg)
     for (i = 0; i < nreps; i++) {
         ompi_atomic_add_32(&val32, 5);
 #if OMPI_HAVE_ATOMIC_MATH_64
-        if (enable_64_bit_tests) {
-            ompi_atomic_add_64(&val64, 5);
-        }
+        ompi_atomic_add_64(&val64, 5);
 #endif
         ompi_atomic_add(&valint, 5);
     }
diff --git a/test/asm/atomic_spinlock.c b/test/asm/atomic_spinlock.c
index 7cfc3ec42e..00ccff9be3 100644
--- a/test/asm/atomic_spinlock.c
+++ b/test/asm/atomic_spinlock.c
@@ -35,6 +35,7 @@ struct start_info {
     ompi_lock_t *lock;
 };
 
+static int atomic_spinlock_test(ompi_lock_t *lock, int count, int id);
 
 #if OMPI_HAVE_POSIX_THREADS
 static void* atomic_spinlock_start(void* arg)
@@ -47,7 +48,7 @@ static void* atomic_spinlock_start(void* arg)
 #endif
 
 
-int
+static int
 atomic_spinlock_test_th(ompi_lock_t *lock, int count, int id, int thr_count)
 {
 #if OMPI_HAVE_POSIX_THREADS
@@ -92,7 +93,7 @@ atomic_spinlock_test_th(ompi_lock_t *lock, int count, int id, int thr_count)
 }
 
 
-int
+static int
 atomic_spinlock_test(ompi_lock_t *lock, int count, int id)
 {
     int i;