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