Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c

2009-02-16  Tor Lillqvist  <tml@novell.com>

	Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c

	* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Cast
	gpointer to char * before pointer arithmetic to avoid compilation
	error with MSVC.

	(_gdk_selection_property_delete): Remove unused variable.

svn path=/trunk/; revision=22337

diff --git a/ChangeLog b/ChangeLog
index 51b4fe4c2f9e1f43a6d901ad870820a9f6a6dd9c..1b66aeba3fa6616a8f5d08b2239edf10d9703c7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-02-16  Tor Lillqvist  <tml@novell.com>
+
+       Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c
+
+       * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Cast
+       gpointer to char * before pointer arithmetic to avoid compilation
+       error with MSVC.
+
+       (_gdk_selection_property_delete): Remove unused variable.
+
 2009-02-13  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Don't forget to

diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index 73588b8d90b57383332cbb9636d0517a42333031..bf87ad70402cc07bdd4dda2e969f74e9e9379a60 100644 (file)
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -686,7 +686,7 @@ gdk_selection_convert (GdkWindow *requestor,
 
                  if (make_dibv5)
                    {
-                     BITMAPV5HEADER *bV5 = data + sizeof (BITMAPFILEHEADER);
+                     BITMAPV5HEADER *bV5 = (BITMAPV5HEADER *) ((char *) data + sizeof (BITMAPFILEHEADER));
                      guchar *p;
                      int i;
 
@@ -741,7 +741,7 @@ gdk_selection_convert (GdkWindow *requestor,
                                       bi->biSize +
                                       bi->biClrUsed * sizeof (RGBQUAD));
 
-                     memcpy (data + sizeof (BITMAPFILEHEADER),
+                     memcpy ((char *) data + sizeof (BITMAPFILEHEADER),
                              bi,
                              data_length);
                    }
@@ -877,8 +877,6 @@ gdk_selection_property_get (GdkWindow  *requestor,
 void
 _gdk_selection_property_delete (GdkWindow *window)
 {
-  GdkSelProp *prop;
-  
   GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p (no-op)\n",
                           GDK_WINDOW_HWND (window)));