diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /JavaScriptCore/wtf/gobject | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'JavaScriptCore/wtf/gobject')
| -rw-r--r-- | JavaScriptCore/wtf/gobject/GTypedefs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/JavaScriptCore/wtf/gobject/GTypedefs.h b/JavaScriptCore/wtf/gobject/GTypedefs.h index 76d1b1a..0b9a9ea 100644 --- a/JavaScriptCore/wtf/gobject/GTypedefs.h +++ b/JavaScriptCore/wtf/gobject/GTypedefs.h @@ -44,7 +44,6 @@ typedef struct _GDir GDir; typedef struct _GdkAtom* GdkAtom; typedef struct _GdkCursor GdkCursor; typedef struct _GdkDragContext GdkDragContext; -typedef struct _GdkDrawable GdkDrawable; typedef struct _GdkEventConfigure GdkEventConfigure; typedef struct _GdkEventExpose GdkEventExpose; typedef struct _GdkPixbuf GdkPixbuf; @@ -85,7 +84,9 @@ typedef struct _GtkWindow GtkWindow; #ifdef GTK_API_VERSION_2 typedef struct _GdkRectangle GdkRectangle; +typedef struct _GdkDrawable GdkWindow; #else +typedef struct _GdkWindow GdkWindow; typedef struct _cairo_rectangle_int cairo_rectangle_int_t; typedef cairo_rectangle_int_t GdkRectangle; #endif |