diff options
| author | Ryan Newton <rrnewton@gmail.com> | 2013-08-31 15:28:02 -0400 |
|---|---|---|
| committer | Ryan Newton <rrnewton@gmail.com> | 2013-08-31 15:28:02 -0400 |
| commit | e251a51a990c3a9c95dabab139d42ad69479f61c (patch) | |
| tree | 94243fe32bb64d0cab79074ef8de8cb3530d2973 /includes | |
| parent | 6fd60b2382efa357fe99fa017fd343db9724d43a (diff) | |
| parent | ea87014a7ad4454f18bb15f6f0ee4b6e61b148be (diff) | |
| download | haskell-e251a51a990c3a9c95dabab139d42ad69479f61c.tar.gz | |
Merge branch 'master' into atomics
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/stg/SMP.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/includes/stg/SMP.h b/includes/stg/SMP.h index be28911fee..07ea522328 100644 --- a/includes/stg/SMP.h +++ b/includes/stg/SMP.h @@ -368,9 +368,12 @@ load_load_barrier(void) { /* ---------------------------------------------------------------------- */ #else /* !THREADED_RTS */ -#define write_barrier() /* nothing */ -#define store_load_barrier() /* nothing */ -#define load_load_barrier() /* nothing */ +EXTERN_INLINE void write_barrier(void); +EXTERN_INLINE void store_load_barrier(void); +EXTERN_INLINE void load_load_barrier(void); +EXTERN_INLINE void write_barrier () {} /* nothing */ +EXTERN_INLINE void store_load_barrier() {} /* nothing */ +EXTERN_INLINE void load_load_barrier () {} /* nothing */ #if !IN_STG_CODE || IN_STGCRUN INLINE_HEADER StgWord |