@@ -70,15 +70,15 @@
 # define of_forward of_method_not_found
 # define of_forward_stret of_method_not_found_stret
 #endif
 
 struct pre_ivar {
-	int32_t retainCount;
-	struct pre_mem *firstMem, *lastMem;
+	int retainCount;
 #if !defined(OF_HAVE_ATOMIC_OPS) && defined(OF_HAVE_THREADS)
 	of_spinlock_t retainCountSpinlock;
 #endif
+	struct pre_mem *firstMem, *lastMem;
 };
 
 struct pre_mem {
 	struct pre_mem *prev, *next;
 	id owner;
@@ -958,11 +958,11 @@
 }
 
 - retain
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
-	of_atomic_inc_32(&PRE_IVARS->retainCount);
+	of_atomic_int_inc(&PRE_IVARS->retainCount);
 #else
 	OF_ENSURE(of_spinlock_lock(&PRE_IVARS->retainCountSpinlock));
 	PRE_IVARS->retainCount++;
 	OF_ENSURE(of_spinlock_unlock(&PRE_IVARS->retainCountSpinlock));
 #endif
@@ -977,11 +977,11 @@
 }
 
 - (void)release
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
-	if (of_atomic_dec_32(&PRE_IVARS->retainCount) <= 0)
+	if (of_atomic_int_dec(&PRE_IVARS->retainCount) <= 0)
 		[self dealloc];
 #else
 	size_t c;
 
 	OF_ENSURE(of_spinlock_lock(&PRE_IVARS->retainCountSpinlock));