Merge branch 'next' into 'next'

cast to make MSVC happy See merge request !5
2015-04-09 18:08:10 +00:00 · 2015-04-09 18:08:10 +00:00 · 5837bcc433
parent 1ca890756a 1f8b45365e
commit 5837bcc433
1 changed files with 1 additions and 1 deletions
--- a/src/porting.cpp
+++ b/src/porting.cpp
@ -311,7 +311,7 @@ std::string getUser()
 	char buff[1024];
 	int size = 1024;

-	if (GetUserName(buff,&size))
+	if (GetUserName(buff,LPDWORD(&size)))
 		return std::string(buff);
 #else
 	char* u = getenv("USER");