diff options
Diffstat (limited to 'WebCore/platform/DragImage.h')
| -rw-r--r-- | WebCore/platform/DragImage.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h index 3045e03..b905432 100644 --- a/WebCore/platform/DragImage.h +++ b/WebCore/platform/DragImage.h @@ -80,7 +80,11 @@ namespace WebCore { typedef BBitmap* DragImageRef; #elif PLATFORM(BREWMP) typedef IImage* DragImageRef; +<<<<<<< HEAD #elif PLATFORM(ANDROID) +======= +#elif PLATFORM(EFL) +>>>>>>> webkit.org at r58033 typedef void* DragImageRef; #endif |