gtk+ r22336 - in branches/gtk-2-14: . gdk/win32

[tml svn gnome org]

Author: tml
Date: Sun Feb 15 22:49:09 2009
New Revision: 22336
URL: http://svn.gnome.org/viewvc/gtk+?rev=22336&view=rev

Log:
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.



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gdk/win32/gdkselection-win32.c

Modified: branches/gtk-2-14/gdk/win32/gdkselection-win32.c
==============================================================================
--- branches/gtk-2-14/gdk/win32/gdkselection-win32.c	(original)
+++ branches/gtk-2-14/gdk/win32/gdkselection-win32.c	Sun Feb 15 22:49:09 2009
@@ -686,7 +686,7 @@
 
 		  if (make_dibv5)
 		    {
-		      BITMAPV5HEADER *bV5 = data + sizeof (BITMAPFILEHEADER);
+		      BITMAPV5HEADER *bV5 = (BITMAPV5HEADER *) ((char *) data + sizeof (BITMAPFILEHEADER));
 		      guchar *p;
 		      int i;
 
@@ -741,7 +741,7 @@
 				       bi->biSize +
 				       bi->biClrUsed * sizeof (RGBQUAD));
 
-		      memcpy (data + sizeof (BITMAPFILEHEADER),
+		      memcpy ((char *) data + sizeof (BITMAPFILEHEADER),
 			      bi,
 			      data_length);
 		    }
@@ -877,8 +877,6 @@
 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)));