From: Tor Lillqvist <tml@novell.com>
Date: Wed, 1 Aug 2007 09:49:02 +0000 (+0000)
Subject: Drop leftover use of a union.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=75f974d1d9ceaaceeb6675db76ec1d7aed511fdd;p=dana%2Fcg-glib.git

Drop leftover use of a union.

2007-08-01  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.c (get_special_folder): Drop leftover use of a
	union.


svn path=/trunk/; revision=5661
---

diff --git a/ChangeLog b/ChangeLog
index 554ba2a8..17e4e627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-01  Tor Lillqvist  <tml@novell.com>
 
+	* glib/gutils.c (get_special_folder): Drop leftover use of a
+	union.
+
 	* glibconfig.h.win32.in: Update to match what configure produces.
 
 2007-07-31  Matthias Clasen  <mclasen@redhat.com>
diff --git a/glib/gutils.c b/glib/gutils.c
index 4279a244..eb28e504 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -1409,10 +1409,7 @@ static  gchar  **g_user_special_dirs = NULL;
 static gchar *
 get_special_folder (int csidl)
 {
-  union {
-    char c[MAX_PATH+1];
-    wchar_t wc[MAX_PATH+1];
-  } path;
+  wchar_t path[MAX_PATH+1];
   HRESULT hr;
   LPITEMIDLIST pidl = NULL;
   BOOL b;
@@ -1421,9 +1418,9 @@ get_special_folder (int csidl)
   hr = SHGetSpecialFolderLocation (NULL, csidl, &pidl);
   if (hr == S_OK)
     {
-      b = SHGetPathFromIDListW (pidl, path.wc);
+      b = SHGetPathFromIDListW (pidl, path);
       if (b)
-	retval = g_utf16_to_utf8 (path.wc, -1, NULL, NULL, NULL);
+	retval = g_utf16_to_utf8 (path, -1, NULL, NULL, NULL);
       CoTaskMemFree (pidl);
     }
   return retval;