From: Jean Guyomarc'h <jean.guyomarch@openwide.fr>
Date: Wed, 14 Oct 2015 07:12:28 +0000 (+0200)
Subject: priv: centralized and safe inclusion of Ecore_Cocoa.h
X-Git-Tag: accepted/tizen/common/20160826.142851~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b023697ae4dc44c545e1359bc5ca5b6527793a7;p=platform%2Fupstream%2Felementary.git

priv: centralized and safe inclusion of Ecore_Cocoa.h

Change-Id: I6a1f4c7530734a0d4910499a698700be96f01dc6
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
---

diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 47bfb1e..8ef65ad 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 9d598e3..e0a9c2c 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 3053cf9..661f553 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"