Patch from Juan Zhao <juan.j.zhao@linux.intel.com> to fix correct

usage of HAVE_ELEMENTARY_WAYLAND.

Signed-off-by: Christopher Michael <cp.michael@samsung.com>
SVN revision: 80301

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 46f6402..914e8b1 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -5008,6 +5008,7 @@ _xwindow_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    *ret = 0;
 }
 
+#if HAVE_ELEMENTARY_WAYLAND\r
 EAPI Ecore_Wl_Window *
 elm_win_wl_window_get(const Evas_Object *obj)
 {
@@ -5029,7 +5030,6 @@ static void
 _wl_window_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
 {
    Ecore_Wl_Window **ret = va_arg(*list, Ecore_Wl_Window **);
-#if HAVE_ELEMENTARY_WAYLAND
    Elm_Win_Smart_Data *sd = _pd;
    if (sd->wl.win)
      {
@@ -5041,9 +5041,9 @@ _wl_window_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
         *ret = elm_win_wl_window_get(sd->parent);
         return;
      }
-#endif
    *ret = NULL;
 }
+#endif\r
 
 EAPI Eina_Bool
 elm_win_trap_set(const Elm_Win_Trap *t)

diff --git a/src/lib/elm_win.h b/src/lib/elm_win.h
index d3b753e..02427e3 100644 (file)
--- a/src/lib/elm_win.h
+++ b/src/lib/elm_win.h
@@ -2651,6 +2651,7 @@ EAPI Eina_Bool             elm_win_socket_listen(Evas_Object *obj, const char *s
  */
 EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
 
+#ifdef HAVE_ELEMENTARY_WAYLAND\r
 /* Wayland specific call - returns NULL on non-Wayland engines */
 /**
  * Get the Ecore_Wl_Window of and Evas_Object
@@ -2662,6 +2663,7 @@ EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
  * @ingroup Win
  */
 EAPI Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj);
+#endif\r
 
 /**
  * @typedef Elm_Win_Trap