[m-rev.] diff: Define out-of-line atomic op functions in high-level C threaded grades.

Peter Wang novalazy at gmail.com
Mon May 18 15:26:03 AEST 2015


Branches: 14.01, master
(also for the FreeBSD patch; I forgot to mention it)

runtime/mercury_atomic_ops.c:
	Define out-of-line atomic op functions in high-level C threaded
	grades.  The inline definitions were made available to both
	high- and low-level C grades in commit ca7878f but not the
	out-of-line definitions.

diff --git a/runtime/mercury_atomic_ops.c b/runtime/mercury_atomic_ops.c
index c39f3be..5f44783 100644
--- a/runtime/mercury_atomic_ops.c
+++ b/runtime/mercury_atomic_ops.c
@@ -16,7 +16,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-#if defined(MR_LL_PARALLEL_CONJ)
+#if defined(MR_THREAD_SAFE)
 
 /*
 ** Definitions for the atomic functions declared `extern inline'.
@@ -132,7 +132,7 @@ MR_OUTLINE_DEFN(
     }
 )
 
-#endif /* MR_LL_PARALLEL_CONJ */
+#endif /* MR_THREAD_SAFE */
 
 /*---------------------------------------------------------------------------*/
 



More information about the reviews mailing list