aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2015-10-15 11:45:41 +0200
committerChris Michael <cp.michael@samsung.com>2015-12-03 11:31:06 -0500
commit667fe4dc8d4ce684ac11a1c0c8de10c9853c831c (patch)
tree3ba180f4985c954d8ea54e61b9ab9055799fb2cb
parentecore_x: factorize multiple calls to strlen() (diff)
downloadefl-667fe4dc8d4ce684ac11a1c0c8de10c9853c831c.tar.gz
ecore_cocoa: don't export Ecore_Cocoa_Keys.h
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/Makefile_Ecore_Cocoa.am4
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa.m6
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_keys.h (renamed from src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h)6
3 files changed, 13 insertions, 3 deletions
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index 9b5ab544b1..66dc4f7494 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -7,11 +7,11 @@ lib_LTLIBRARIES += lib/ecore_cocoa/libecore_cocoa.la
installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@
dist_installed_ecorecocoamainheaders_DATA = \
lib/ecore_cocoa/Ecore_Cocoa.h \
-lib/ecore_cocoa/Ecore_Cocoa_Cursor.h \
-lib/ecore_cocoa/Ecore_Cocoa_Keys.h
+lib/ecore_cocoa/Ecore_Cocoa_Cursor.h
lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \
lib/ecore_cocoa/ecore_cocoa.m \
+lib/ecore_cocoa/ecore_cocoa_keys.h \
lib/ecore_cocoa/ecore_cocoa_window.h \
lib/ecore_cocoa/ecore_cocoa_window.m \
lib/ecore_cocoa/ecore_cocoa_cnp.m \
diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m
index 55a7f70602..89afc8a421 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
@@ -12,7 +12,11 @@
#include <Ecore_Input.h>
#include "Ecore_Cocoa.h"
-#include "Ecore_Cocoa_Keys.h"
+
+#define _ECORE_COCOA_KEYS_MANUAL_GUARD_
+#include "ecore_cocoa_keys.h"
+#undef _ECORE_COCOA_KEYS_MANUAL_GUARD_
+
#include "ecore_cocoa_private.h"
EAPI int ECORE_COCOA_EVENT_GOT_FOCUS = 0;
diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h b/src/lib/ecore_cocoa/ecore_cocoa_keys.h
index 89004d2b00..4eda272cf3 100644
--- a/src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h
+++ b/src/lib/ecore_cocoa/ecore_cocoa_keys.h
@@ -1,6 +1,12 @@
#ifndef ECORE_COCOA_KEYS_H__
#define ECORE_COCOA_KEYS_H__
+/* Prevent innocent devs to include this directly. */
+#ifndef _ECORE_COCOA_KEYS_MANUAL_GUARD_
+# error This header must be be included directly!
+#endif
+
+
struct _ecore_cocoa_keys_s
{
int code;