- solve build for x11 i586 and x86_64.

Change-Id: I3c4a421de4744042f6c6d131b84bd9563e147c0c
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h b/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h
index 9372d82..6293575 100644 (file)
--- a/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h
+++ b/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h
@@ -40,7 +40,10 @@
 #define EGL_EGLEXT_PROTOTYPES 1
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
+
+#if PLATFORM(WAYLAND) && USE(MESA)
 #include "WaylandPlatformExt.h"
+#endif
 
 #define GL_GLEXT_PROTOTYPES 1
 #if USE(OPENGL_ES_2)

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp
index 7ab06a6..86a37b2 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp
@@ -29,8 +29,6 @@
 #include <Elementary.h>
 #include <libintl.h>
 
-#if ENABLE(TIZEN_DESKTOP_BROWSING)
-
 #if ENABLE(TIZEN_MULTIPLE_SELECT)
 int compareChangedItems(const void* a, const void* b)
 {
@@ -40,6 +38,8 @@ int compareChangedItems(const void* a, const void* b)
 }
 #endif
 
+#if ENABLE(TIZEN_DESKTOP_BROWSING)
+
 static void on_popup_menu_discarded(void *user_data, Evas_Object *obj, void *event_info)
 {
     // The user clicked outside the menu to discard it.
@@ -400,12 +400,5 @@ void ewk_popup_picker_resize(Ewk_Popup_Picker* picker)
     resizeAndShowPicker(picker);
 }
 
-#if ENABLE(TIZEN_MULTIPLE_SELECT)
-int compareChangedItems(const void* a, const void* b)
-{
-    const int* left = static_cast<const int*>(a);
-    const int* right = static_cast<const int*>(b);
-    return (*left - *right);
-}
-#endif // ENABLE(TIZEN_DESKTOP_BROWSING)
+
 #endif // ENABLE(TIZEN_WEBKIT2_POPUP_INTERNAL)