ecore_cocoa: don't export Ecore_Cocoa_Keys.h 99/82899/3
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>
Thu, 15 Oct 2015 09:45:41 +0000 (11:45 +0200)
committerHermet Park <chuneon.park@samsung.com>
Fri, 2 Sep 2016 03:00:49 +0000 (20:00 -0700)
Change-Id: Id477644a9b469c6b70b7c280bc891112e47d2b57
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
src/Makefile_Ecore_Cocoa.am
src/lib/ecore_cocoa/ecore_cocoa.m
src/lib/ecore_cocoa/ecore_cocoa_keys.h [moved from src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h with 98% similarity]

index 9b5ab54..66dc4f7 100644 (file)
@@ -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 \
index 80d351e..03e1488 100644 (file)
 #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;
similarity index 98%
rename from src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h
rename to src/lib/ecore_cocoa/ecore_cocoa_keys.h
index 89004d2..4eda272 100644 (file)
@@ -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;