Index: src/OFLocale.m
==================================================================
--- src/OFLocale.m
+++ src/OFLocale.m
@@ -464,11 +464,11 @@
 				for (length = 0; length < 4; length++)
 					if (((char *)territory)[length] == 0)
 						break;
 
 				_territory = [[OFString alloc]
-				    initWithCString: territory.c
+				    initWithCString: territory
 					   encoding: _encoding
 					     length: length];
 			} @finally {
 				CloseLocale(locale);
 			}

Index: src/macros.h
==================================================================
--- src/macros.h
+++ src/macros.h
@@ -560,14 +560,14 @@
 	memcpy(&ret, &f, 4);
 	return ret;
 }
 
 static OF_INLINE float
-OF_INT_TO_FLOAT_RAW(uint32_t u32)
+OF_INT_TO_FLOAT_RAW(uint32_t uInt32)
 {
 	float ret;
-	memcpy(&ret, &u32, 4);
+	memcpy(&ret, &uInt32, 4);
 	return ret;
 }
 
 static OF_INLINE uint64_t
 OF_DOUBLE_TO_INT_RAW(double d)
@@ -576,14 +576,14 @@
 	memcpy(&ret, &d, 8);
 	return ret;
 }
 
 static OF_INLINE double
-OF_INT_TO_DOUBLE_RAW(uint64_t u64)
+OF_INT_TO_DOUBLE_RAW(uint64_t uInt64)
 {
 	double ret;
-	memcpy(&ret, &u64, 8);
+	memcpy(&ret, &uInt64, 8);
 	return ret;
 }
 
 static OF_INLINE float OF_CONST_FUNC
 OF_BSWAP_FLOAT(float f)