From ad6e3ce3df422751cb1c4524f1ea0b16ce897410 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Wed, 9 Aug 2017 13:24:48 +0900
Subject: [PATCH] elm: Add missing undef EAPI to Elementary.h

This may solve issues on Windows where EAPI can be either dllimport or
dllexport. Anyway keeping EAPI defined is invalid and inconsistent.

Also, change an invalid EO_BETA_API define tag to EFL_BETA_API_SUPPORT
and EFL_EO_API_SUPPORT.

Thanks @vtorri for the report!

@fix
---
 src/lib/elementary/Elementary.h | 3 +++
 src/lib/elementary/elm_helper.h | 2 +-
 src/lib/elementary/elm_priv.h   | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 1ea4d67244..829a622bcf 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -285,4 +285,7 @@ EAPI extern Elm_Version *elm_version;
 }
 #endif
 
+#undef EAPI
+#define EAPI
+
 #endif
diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h
index df117369a5..2cc350e869 100644
--- a/src/lib/elementary/elm_helper.h
+++ b/src/lib/elementary/elm_helper.h
@@ -77,7 +77,7 @@ elm_validator_regexp_free(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1);
 EAPI Elm_Regexp_Status
 elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1);
 
-#ifdef EO_BETA_API
+#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
 /**
  * @brief The regex validator. Used as callback to validate event.
  *
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 80f410ef43..5435e4557b 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -641,4 +641,7 @@ const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo *o
 #define ELM_LAYOUT_SIZING_EVAL_OPS(_pfx) \
    EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _##_pfx##_elm_layout_sizing_eval)
 
+#undef EAPI
+#define EAPI
+
 #endif