Commit f8f4e16e authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Correct C99ism (mixed declarations and code) in Win32 ifdef branch.

2006-09-02  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.c (g_get_any_init_do): Correct C99ism (mixed
	declarations and code) in Win32 ifdef branch. (#353903, Mike
	Edenfield)
parent d6a4b61c
2006-09-02 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (g_get_any_init_do): Correct C99ism (mixed
declarations and code) in Win32 ifdef branch. (#353903, Mike
Edenfield)
2006-09-01 Abel Cheung <abel@oaka.org>
* configure.in: Added 'dz' 'hy' to ALL_LINGUAS.
......
......@@ -1627,14 +1627,16 @@ g_get_any_init_do (void)
#else /* !HAVE_PWD_H */
#ifdef G_OS_WIN32
guint len = UNLEN+1;
wchar_t buffer[UNLEN+1];
{
guint len = UNLEN+1;
wchar_t buffer[UNLEN+1];
if (GetUserNameW (buffer, (LPDWORD) &len))
{
g_user_name = g_utf16_to_utf8 (buffer, -1, NULL, NULL, NULL);
g_real_name = g_strdup (g_user_name);
}
if (GetUserNameW (buffer, (LPDWORD) &len))
{
g_user_name = g_utf16_to_utf8 (buffer, -1, NULL, NULL, NULL);
g_real_name = g_strdup (g_user_name);
}
}
#endif /* G_OS_WIN32 */
#endif /* !HAVE_PWD_H */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment