diff options
Diffstat (limited to 'WebCore/platform/DragData.h')
| -rw-r--r-- | WebCore/platform/DragData.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/platform/DragData.h b/WebCore/platform/DragData.h index eda7e7e..9bad699 100644 --- a/WebCore/platform/DragData.h +++ b/WebCore/platform/DragData.h @@ -52,10 +52,17 @@ typedef struct IDataObject* DragDataRef; #elif PLATFORM(WX) typedef class wxDataObject* DragDataRef; #elif PLATFORM(GTK) +<<<<<<< HEAD // FIXME: this should probably be something gdk-specific typedef void* DragDataRef; #elif defined ANDROID typedef void* DragDataRef; +======= +namespace WebCore { +class DataObjectGtk; +} +typedef WebCore::DataObjectGtk* DragDataRef; +>>>>>>> webkit.org at r62496 #elif PLATFORM(CHROMIUM) #include "DragDataRef.h" #elif PLATFORM(HAIKU) |