Merge pull request #3831 from rhc54/topic/fix

Ralph Castain · web-flow · commit b2f90e5d1b7d · 2017-07-07T08:04:30.000-07:00
Prefix the MB macro in one more place
diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/sync_builtin/atomic.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/sync_builtin/atomic.h
@@ -46,7 +46,7 @@ static inline void pmix_atomic_wmb(void)
     __sync_synchronize();
 }
 
-#define MB() pmix_atomic_mb()
+#define PMIXMB() pmix_atomic_mb()
 
 /**********************************************************************
  *

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ static inline void pmix_atomic_wmb(void)`
`46`	`46`	`__sync_synchronize();`
`47`	`47`	`}`
`48`	`48`
`49`		`-#define MB() pmix_atomic_mb()`
	`49`	`+#define PMIXMB() pmix_atomic_mb()`
`50`	`50`
`51`	`51`	`/**********************************************************************`
`52`	`52`	`*`