cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=cf5b1624bb5b62c44bf581550568940dcd92009f
commit cf5b1624bb5b62c44bf581550568940dcd92009f
Author: Jean Guyomarc'h <jean.guyoma...@openwide.fr>
Date: Wed Oct 14 09:12:28 2015 +0200
priv: centralized and safe inclusion of Ecore_Cocoa.h
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/lib/elm_cnp.c | 4 ----
src/lib/elm_priv.h | 8 ++++++++
src/lib/els_cursor.c | 3 +--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 851c28b..ed6f3a1 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -8,10 +8,6 @@
# include <sys/mman.h>
#endif
-#ifdef HAVE_ELEMENTARY_COCOA
-# include <Ecore_Cocoa.h>
-#endif
-
//#define DEBUGON 1
#ifdef DEBUGON
# define cnp_debug(fmt, args...) fprintf(stderr, __FILE__":%s/%d : " fmt ,
__FUNCTION__, __LINE__, ##args)
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index e783e44..1afc2fc 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -12,6 +12,14 @@
#ifdef HAVE_ELEMENTARY_DRM
#include <Ecore_Drm.h>
#endif
+#ifdef HAVE_ELEMENTARY_COCOA
+/* Ecore_Cocoa is still in Beta. In Elementary, we know what we are
+ * doing, so let's silent the disclaimer... */
+# ifndef ECORE_COCOA_WIP_GNSIDNQI
+# define ECORE_COCOA_WIP_GNSIDNQI
+#endif
+# include <Ecore_Cocoa.h>
+#endif
#include <Eio.h>
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index eaed2de..6aae337 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -13,8 +13,7 @@
#endif
#ifdef HAVE_ELEMENTARY_COCOA
-#include <Ecore_Cocoa.h>
-#include <Ecore_Cocoa_Cursor.h>
+# include <Ecore_Cocoa_Cursor.h>
#endif
#define _cursor_key "_elm_cursor"
--
