diff options
| author | Jean Guyomarc'h <jean.guyomarch@openwide.fr> | 2015-10-14 09:12:28 +0200 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-12-03 11:06:16 -0800 |
| commit | cf5b1624bb5b62c44bf581550568940dcd92009f (patch) | |
| tree | d1afd93f76be526242e1c37c1667e6a89585531d | |
| parent | b12b2a4f379f406e659fc9462e6834c294fb0fff (diff) | |
| download | elementary-cf5b1624bb5b62c44bf581550568940dcd92009f.tar.gz | |
priv: centralized and safe inclusion of Ecore_Cocoa.h
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
| -rw-r--r-- | src/lib/elm_cnp.c | 4 | ||||
| -rw-r--r-- | src/lib/elm_priv.h | 8 | ||||
| -rw-r--r-- | 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 851c28be0..ed6f3a1a3 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 e783e44ce..1afc2fc6d 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 eaed2de0f..6aae337b0 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" |