@@ -264,18 +264,18 @@
 	return !pthread_cond_wait(condition, mutex);
 #elif defined(_WIN32)
 	if (!of_mutex_unlock(mutex))
 		return false;
 
-	of_atomic_inc_int(&condition->count);
+	of_atomic_int_inc(&condition->count);
 
 	if (WaitForSingleObject(condition->event, INFINITE) != WAIT_OBJECT_0) {
 		of_mutex_lock(mutex);
 		return false;
 	}
 
-	of_atomic_dec_int(&condition->count);
+	of_atomic_int_dec(&condition->count);
 
 	if (!of_mutex_lock(mutex))
 		return false;
 
 	return true;
@@ -297,19 +297,19 @@
 	return !pthread_cond_timedwait(condition, mutex, &ts);
 #elif defined(_WIN32)
 	if (!of_mutex_unlock(mutex))
 		return false;
 
-	of_atomic_inc_int(&condition->count);
+	of_atomic_int_inc(&condition->count);
 
 	if (WaitForSingleObject(condition->event,
 	    timeout * 1000) != WAIT_OBJECT_0) {
 		of_mutex_lock(mutex);
 		return false;
 	}
 
-	of_atomic_dec_int(&condition->count);
+	of_atomic_int_dec(&condition->count);
 
 	if (!of_mutex_lock(mutex))
 		return false;
 
 	return true;
@@ -426,11 +426,11 @@
 
 static OF_INLINE bool
 of_spinlock_trylock(of_spinlock_t *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
-	return of_atomic_cmpswap_int(spinlock, 0, 1);
+	return of_atomic_int_cmpswap(spinlock, 0, 1);
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 	return !pthread_spin_trylock(spinlock);
 #else
 	return of_mutex_trylock(spinlock);
 #endif
@@ -467,11 +467,11 @@
 
 static OF_INLINE bool
 of_spinlock_unlock(of_spinlock_t *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
-	return of_atomic_cmpswap_int(spinlock, 1, 0);
+	return of_atomic_int_cmpswap(spinlock, 1, 0);
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 	return !pthread_spin_unlock(spinlock);
 #else
 	return of_mutex_unlock(spinlock);
 #endif