Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -171,11 +171,11 @@
 		void *pool;
 		OFMutableDictionary *environment;
 #if defined(__MACH__) && !defined(OF_IOS)
 		char **env = *_NSGetEnviron();
 #elif defined(__WIN32)
-		of_char16_t *env;
+		of_char16_t *env, *env0;
 #elif !defined(OF_IOS)
 		char **env = environ;
 #else
 		char *env;
 #endif
@@ -182,11 +182,11 @@
 
 		environment = [[OFMutableDictionary alloc] init];
 
 		atexit(atexitHandler);
 #if defined(_WIN32)
-		env = GetEnvironmentStringsW();
+		env = env0 = GetEnvironmentStringsW();
 
 		while (*env != 0) {
 			OFString *tmp, *key, *value;
 			size_t length, pos;
 
@@ -222,11 +222,11 @@
 					forKey: key];
 
 			objc_autoreleasePoolPop(pool);
 		}
 
-		FreeEnvironmentStringsW(env);
+		FreeEnvironmentStringsW(env0);
 #elif !defined(OF_IOS)
 		if (env != NULL) {
 			for (; *env != NULL; env++) {
 				OFString *key, *value;
 				char *sep;