summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2015-10-14 09:12:28 +0200
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-12 10:41:40 +0100
commit3cea1a9c0d1978e4c1d4e1a081d0b59388dd4017 (patch)
treec821e5038b8812909de24d7c8e3be5e11994b4ad
parent4749611576cee686826664a3ce62c7103495fbff (diff)
elm_priv: centralized and safe inclusion of Ecore_Cocoa.h
-rw-r--r--src/lib/elm_cnp.c4
-rw-r--r--src/lib/elm_priv.h8
-rw-r--r--src/lib/els_cursor.c3
3 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 74f3153d0..ab1d3d041 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -8,10 +8,6 @@
8# include <sys/mman.h> 8# include <sys/mman.h>
9#endif 9#endif
10 10
11#ifdef HAVE_ELEMENTARY_COCOA
12# include <Ecore_Cocoa.h>
13#endif
14
15//#define DEBUGON 1 11//#define DEBUGON 1
16#ifdef DEBUGON 12#ifdef DEBUGON
17# define cnp_debug(fmt, args...) fprintf(stderr, __FILE__":%s/%d : " fmt , __FUNCTION__, __LINE__, ##args) 13# 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 be92f1513..468f1e69c 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -12,6 +12,14 @@
12#ifdef HAVE_ELEMENTARY_DRM 12#ifdef HAVE_ELEMENTARY_DRM
13#include <Ecore_Drm.h> 13#include <Ecore_Drm.h>
14#endif 14#endif
15#ifdef HAVE_ELEMENTARY_COCOA
16/* Ecore_Cocoa is still in Beta. In Elementary, we know what we are
17 * doing, so let's silent the disclaimer... */
18# ifndef ECORE_COCOA_WIP_GNSIDNQI
19# define ECORE_COCOA_WIP_GNSIDNQI
20#endif
21# include <Ecore_Cocoa.h>
22#endif
15 23
16#include <Eio.h> 24#include <Eio.h>
17 25
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index 3053cf996..661f553e2 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -13,8 +13,7 @@
13#endif 13#endif
14 14
15#ifdef HAVE_ELEMENTARY_COCOA 15#ifdef HAVE_ELEMENTARY_COCOA
16#include <Ecore_Cocoa.h> 16# include <Ecore_Cocoa_Cursor.h>
17#include <Ecore_Cocoa_Cursor.h>
18#endif 17#endif
19 18
20#define _cursor_key "_elm_cursor" 19#define _cursor_key "_elm_cursor"