@@ -12,12 +12,10 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-OF_ASSUME_NONNULL_BEGIN
-
 static OF_INLINE int
 of_atomic_int_add(volatile int *_Nonnull p, int i)
 {
 	return __sync_add_and_fetch(p, i);
 }
@@ -130,35 +128,21 @@
 {
 	return __sync_bool_compare_and_swap(p, o, n);
 }
 
 static OF_INLINE void
-of_memory_barrier_sync(void)
+of_memory_barrier(void)
 {
 	__sync_synchronize();
 }
 
 static OF_INLINE void
-of_memory_barrier_enter(void)
+of_memory_barrier_acquire(void)
 {
 	__sync_synchronize();
 }
 
 static OF_INLINE void
-of_memory_barrier_exit(void)
+of_memory_barrier_release(void)
 {
 	__sync_synchronize();
 }
-
-static OF_INLINE void
-of_memory_barrier_producer(void)
-{
-	__sync_synchronize();
-}
-
-static OF_INLINE void
-of_memory_barrier_consumer(void)
-{
-	__sync_synchronize();
-}
-
-OF_ASSUME_NONNULL_END