Re-order declarations to un-break the non-HAS_TEST_AND_SET case.

diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 265dec1061bee28970c5695ead9d94bcb3f1a1ed..c692230fd3609d0a00571f5e97aecf02f06b1865 100644 (file)
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -84,13 +84,6 @@
 
 #include "storage/ipc.h"
 
-/* Platform-independent out-of-line support routines */
-extern void s_lock(volatile slock_t *lock,
-          const char *file, const int line);
-extern void s_lock_sleep(unsigned spins, int timeout, int microsec,
-                        volatile slock_t *lock,
-                        const char *file, const int line);
-
 
 #if defined(HAS_TEST_AND_SET)
 
@@ -548,4 +541,14 @@ extern int tas(volatile slock_t *lock);            /* in port/.../tas.s, or
 #endif  /* TAS */
 
 
+/****************************************************************************
+ * Platform-independent out-of-line support routines
+ */
+
+extern void s_lock(volatile slock_t *lock,
+          const char *file, const int line);
+extern void s_lock_sleep(unsigned spins, int timeout, int microsec,
+                        volatile slock_t *lock,
+                        const char *file, const int line);
+
 #endif  /* S_LOCK_H */