From b273bf7f9ab95c1dbf541938337abc12b06000fc Mon Sep 17 00:00:00 2001
From: Christopher Michael <cp.michael@samsung.com>
Date: Tue, 6 Aug 2019 08:36:50 -0400
Subject: [PATCH] ecore_wl2: Move ecore_wl2_window_rotation_change functions to
 be internal

These functions are not used in efl wayland clients nor are they used
in Enlightenment. As such, there is no reason that they need to be
public API so this commit moves them to be Internal and updates
Ecore_Evas engine code to include the internal header.

ref T8013
---
 src/lib/ecore_wl2/Ecore_Wl2.h                 |  9 ----
 src/lib/ecore_wl2/ecore_wl2_internal.h        | 43 +++++++++++++++++++
 src/lib/ecore_wl2/ecore_wl2_private.h         |  1 +
 src/lib/ecore_wl2/meson.build                 |  1 +
 .../wayland/ecore_evas_wayland_private.h      |  1 +
 5 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 src/lib/ecore_wl2/ecore_wl2_internal.h

diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 59aee96eab..c7860f1595 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -412,10 +412,6 @@ EAPI extern int ECORE_WL2_EVENT_SEAT_KEYBOARD_REPEAT_CHANGED; /** @since 1.20 */
 EAPI extern int ECORE_WL2_EVENT_SEAT_SELECTION; /** @since 1.20 */
 EAPI extern int ECORE_WL2_EVENT_OUTPUT_TRANSFORM; /** @since 1.20 */
 EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATE; /** @since 1.20 */
-EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE; /** @since 1.20 */
-EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE; /** @since 1.20 */
-EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST; /** @since 1.20 */
-EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE; /** @since 1.20 */
 EAPI extern int ECORE_WL2_EVENT_AUX_HINT_ALLOWED; /** @since 1.20 */
 EAPI extern int ECORE_WL2_EVENT_AUX_HINT_SUPPORTED; /** @since 1.20 */
 EAPI extern int ECORE_WL2_EVENT_AUX_MESSAGE; /** @since 1.20 */
@@ -1137,11 +1133,6 @@ EAPI void ecore_wl2_window_available_rotations_set(Ecore_Wl2_Window *window, con
  */
 EAPI Eina_Bool ecore_wl2_window_available_rotations_get(Ecore_Wl2_Window *window, int **rots, unsigned int *count);
 
-EAPI void ecore_wl2_window_rotation_change_prepare_send(Ecore_Wl2_Window *window, int rot, int w, int h, Eina_Bool resize);
-EAPI void ecore_wl2_window_rotation_change_prepare_done_send(Ecore_Wl2_Window *window, int rot);
-EAPI void ecore_wl2_window_rotation_change_request_send(Ecore_Wl2_Window *window, int rot);
-EAPI void ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, int rot, int w, int h);
-
 /**
  * Get list of supported auxiliary window hints
  *
diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h
new file mode 100644
index 0000000000..dbc2e6434f
--- /dev/null
+++ b/src/lib/ecore_wl2/ecore_wl2_internal.h
@@ -0,0 +1,43 @@
+#ifndef _ECORE_WL2_INTERNAL_H
+# define _ECORE_WL2_INTERNAL_H
+
+# ifdef EAPI
+#  undef EAPI
+# endif
+
+# ifdef _WIN32
+#  ifdef EFL_BUILD
+#   ifdef DLL_EXPORT
+#    define EAPI __declspec(dllexport)
+#   else
+#    define EAPI
+#   endif
+#  else
+#   define EAPI __declspec(dllimport)
+#  endif
+# else
+#  ifdef __GNUC__
+#   if __GNUC__ >= 4
+#    define EAPI __attribute__ ((visibility("default")))
+#   else
+#    define EAPI
+#   endif
+#  else
+#   define EAPI
+#  endif
+# endif
+
+EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE; /** @since 1.20 */
+EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE; /** @since 1.20 */
+EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST; /** @since 1.20 */
+EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE; /** @since 1.20 */
+
+EAPI void ecore_wl2_window_rotation_change_prepare_send(Ecore_Wl2_Window *window, int rot, int w, int h, Eina_Bool resize);
+EAPI void ecore_wl2_window_rotation_change_prepare_done_send(Ecore_Wl2_Window *window, int rot);
+EAPI void ecore_wl2_window_rotation_change_request_send(Ecore_Wl2_Window *window, int rot);
+EAPI void ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, int rot, int w, int h);
+
+# undef EAPI
+# define EAPI
+
+#endif
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h
index 4c19886842..4d8420f805 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -6,6 +6,7 @@
 # include "Ecore_Input.h"
 # include <xkbcommon/xkbcommon-compose.h>
 # include "www-client-protocol.h"
+# include "ecore_wl2_internal.h"
 
 # define EFL_TEAMWORK_VERSION 2
 # include "teamwork-client-protocol.h"
diff --git a/src/lib/ecore_wl2/meson.build b/src/lib/ecore_wl2/meson.build
index b455ba586f..b053dc4d8a 100644
--- a/src/lib/ecore_wl2/meson.build
+++ b/src/lib/ecore_wl2/meson.build
@@ -9,6 +9,7 @@ ecore_wl2_header_src = [
 ]
 
 ecore_wl2_src = [
+  'ecore_wl2_internal.h',
   'ecore_wl2_subsurf.c',
   'ecore_wl2_dnd.c',
   'ecore_wl2_window.c',
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index 1820ef161a..e69970f262 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -26,6 +26,7 @@
 #  include <Ecore_Evas.h>
 # endif
 
+# include "ecore_wl2_internal.h"
 # include "ecore_wl2_private.h"
 # include "ecore_private.h"
 # include "ecore_evas_private.h"