From 85c6f6eb76c83c7108e2dcc47d396fc32a14f2b8 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 20 Jan 2005 01:19:45 +0000 Subject: [PATCH] Squash strict aliasing warning in _NET_VIRTUAL_ROOTS code. Wed Jan 19 17:17:31 2005 Manish Singh * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash strict aliasing warning in _NET_VIRTUAL_ROOTS code. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkwindow-x11.c | 10 +++++++--- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a68de5e84..b0eef4bb1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 19 17:17:31 2005 Manish Singh + + * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash + strict aliasing warning in _NET_VIRTUAL_ROOTS code. + 2005-01-19 Tor Lillqvist * gdk/win32/gdkkeys-win32.c (update_keymap, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5a68de5e84..b0eef4bb1c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Jan 19 17:17:31 2005 Manish Singh + + * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash + strict aliasing warning in _NET_VIRTUAL_ROOTS code. + 2005-01-19 Tor Lillqvist * gdk/win32/gdkkeys-win32.c (update_keymap, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5a68de5e84..b0eef4bb1c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Jan 19 17:17:31 2005 Manish Singh + + * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash + strict aliasing warning in _NET_VIRTUAL_ROOTS code. + 2005-01-19 Tor Lillqvist * gdk/win32/gdkkeys-win32.c (update_keymap, diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index da250e5c17..040b32baaa 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -3134,6 +3134,7 @@ gdk_window_get_frame_extents (GdkWindow *window, Window xparent; Window root; Window *children; + guchar *data; Window *vroots; Atom type_return; unsigned int nchildren; @@ -3182,11 +3183,14 @@ gdk_window_get_frame_extents (GdkWindow *window, "_NET_VIRTUAL_ROOTS"), 0, 0x7fffffff, False, XA_WINDOW, &type_return, &format_return, &nitems_return, &bytes_after_return, - (unsigned char **)(&vroots)) + &data) == Success) { - if ((type_return == XA_WINDOW) && (format_return == 32) && (vroots)) - nvroots = nitems_return; + if ((type_return == XA_WINDOW) && (format_return == 32) && (data)) + { + nvroots = nitems_return; + vroots = (Window *)data; + } } xparent = GDK_WINDOW_XID (window);