@@ -37,16 +37,16 @@
 typedef struct SignalSemaphore OFPlainMutex;
 #endif
 
 #if defined(OF_HAVE_ATOMIC_OPS)
 # import "atomic.h"
-typedef volatile int of_spinlock_t;
+typedef volatile int OFSpinlock;
 # define OF_SPINCOUNT 10
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
-typedef pthread_spinlock_t of_spinlock_t;
+typedef pthread_spinlock_t OFSpinlock;
 #else
-typedef OFPlainMutex of_spinlock_t;
+typedef OFPlainMutex OFSpinlock;
 #endif
 
 #ifdef OF_HAVE_SCHED_YIELD
 # include <sched.h>
 #endif
@@ -90,11 +90,11 @@
 	Sleep(0);
 #endif
 }
 
 static OF_INLINE int
-of_spinlock_new(of_spinlock_t *spinlock)
+OFSpinlockNew(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	*spinlock = 0;
 	return 0;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
@@ -103,11 +103,11 @@
 	return OFPlainMutexNew(spinlock);
 #endif
 }
 
 static OF_INLINE int
-of_spinlock_trylock(of_spinlock_t *spinlock)
+OFSpinlockTryLock(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	if (of_atomic_int_cmpswap(spinlock, 0, 1)) {
 		of_memory_barrier_acquire();
 		return 0;
@@ -120,20 +120,20 @@
 	return OFPlainMutexTryLock(spinlock);
 #endif
 }
 
 static OF_INLINE int
-of_spinlock_lock(of_spinlock_t *spinlock)
+OFSpinlockLock(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	size_t i;
 
 	for (i = 0; i < OF_SPINCOUNT; i++)
-		if (of_spinlock_trylock(spinlock) == 0)
+		if (OFSpinlockTryLock(spinlock) == 0)
 			return 0;
 
-	while (of_spinlock_trylock(spinlock) == EBUSY)
+	while (OFSpinlockTryLock(spinlock) == EBUSY)
 		OFYieldThread();
 
 	return 0;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 	return pthread_spin_lock(spinlock);
@@ -141,11 +141,11 @@
 	return OFPlainMutexLock(spinlock);
 #endif
 }
 
 static OF_INLINE int
-of_spinlock_unlock(of_spinlock_t *spinlock)
+OFSpinlockUnlock(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	bool ret = of_atomic_int_cmpswap(spinlock, 1, 0);
 
 	of_memory_barrier_release();
@@ -157,15 +157,15 @@
 	return OFPlainMutexUnlock(spinlock);
 #endif
 }
 
 static OF_INLINE int
-of_spinlock_free(of_spinlock_t *spinlock)
+OFSpinlockFree(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	return 0;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 	return pthread_spin_destroy(spinlock);
 #else
 	return OFPlainMutexFree(spinlock);
 #endif
 }