From c844b548f3f3579fe8ffd7d686ff75cd8fc14ec3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 9 Jan 2005 19:11:40 +0000 Subject: [PATCH] Fix cast. (#163133, Roger Leigh) 2005-01-09 Tor Lillqvist * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger Leigh) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-12 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ glib/gwin32.c | 2 +- 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 30e7152..52c9198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-01-09 Tor Lillqvist + * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger + Leigh) + * glib/gfileutils.c: Include on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 30e7152..52c9198 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-01-09 Tor Lillqvist + * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger + Leigh) + * glib/gfileutils.c: Include on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 30e7152..52c9198 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,8 @@ 2005-01-09 Tor Lillqvist + * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger + Leigh) + * glib/gfileutils.c: Include on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 30e7152..52c9198 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2005-01-09 Tor Lillqvist + * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger + Leigh) + * glib/gfileutils.c: Include on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 30e7152..52c9198 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-01-09 Tor Lillqvist + * glib/gwin32.c (g_win32_error_message): Fix cast. (#163133, Roger + Leigh) + * glib/gfileutils.c: Include on Windows for prototypes. (#163390, Kazuki Iwamoto) diff --git a/glib/gwin32.c b/glib/gwin32.c index fddf549..7939856 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -1064,7 +1064,7 @@ g_win32_error_message (gint error) |FORMAT_MESSAGE_IGNORE_INSERTS |FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, - (LPTSTR) &msg, 0, NULL); + (LPWSTR) &msg, 0, NULL); if (msg != NULL) { nchars = wcslen (msg); -- 2.7.4