callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Tor Lillqvist
2009-02-15 22:51:56 +00:00
committed by Tor Lillqvist
parent 99af7a8059
commit b62e3113e6
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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> 2009-02-13 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Don't forget to * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Don't forget to

6
gdk/win32/gdkselection-win32.c
View File

@ -686,7 +686,7 @@ gdk_selection_convert (GdkWindow *requestor,
if (make_dibv5) if (make_dibv5)
{ {
BITMAPV5HEADER *bV5 = data + sizeof (BITMAPFILEHEADER); BITMAPV5HEADER *bV5 = (BITMAPV5HEADER *) ((char *) data + sizeof (BITMAPFILEHEADER));
guchar *p; guchar *p;
int i; int i;
@ -741,7 +741,7 @@ gdk_selection_convert (GdkWindow *requestor,
bi->biSize + bi->biSize +
bi->biClrUsed * sizeof (RGBQUAD)); bi->biClrUsed * sizeof (RGBQUAD));
memcpy (data + sizeof (BITMAPFILEHEADER), memcpy ((char *) data + sizeof (BITMAPFILEHEADER),
bi, bi,
data_length); data_length);
} }
@ -877,8 +877,6 @@ gdk_selection_property_get (GdkWindow *requestor,
void void
_gdk_selection_property_delete (GdkWindow *window) _gdk_selection_property_delete (GdkWindow *window)
{ {
GdkSelProp *prop;
GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p (no-op)\n", GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p (no-op)\n",
GDK_WINDOW_HWND (window))); GDK_WINDOW_HWND (window)));