summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 9b5ab54..66dc4f7 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
7installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@ 7installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@
8dist_installed_ecorecocoamainheaders_DATA = \ 8dist_installed_ecorecocoamainheaders_DATA = \
9lib/ecore_cocoa/Ecore_Cocoa.h \ 9lib/ecore_cocoa/Ecore_Cocoa.h \
10lib/ecore_cocoa/Ecore_Cocoa_Cursor.h \ 10lib/ecore_cocoa/Ecore_Cocoa_Cursor.h
11lib/ecore_cocoa/Ecore_Cocoa_Keys.h
12 11
13lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \ 12lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \
14lib/ecore_cocoa/ecore_cocoa.m \ 13lib/ecore_cocoa/ecore_cocoa.m \
14lib/ecore_cocoa/ecore_cocoa_keys.h \
15lib/ecore_cocoa/ecore_cocoa_window.h \ 15lib/ecore_cocoa/ecore_cocoa_window.h \
16lib/ecore_cocoa/ecore_cocoa_window.m \ 16lib/ecore_cocoa/ecore_cocoa_window.m \
17lib/ecore_cocoa/ecore_cocoa_cnp.m \ 17lib/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 55a7f70..89afc8a 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
@@ -12,7 +12,11 @@
12#include <Ecore_Input.h> 12#include <Ecore_Input.h>
13 13
14#include "Ecore_Cocoa.h" 14#include "Ecore_Cocoa.h"
15#include "Ecore_Cocoa_Keys.h" 15
16#define _ECORE_COCOA_KEYS_MANUAL_GUARD_
17#include "ecore_cocoa_keys.h"
18#undef _ECORE_COCOA_KEYS_MANUAL_GUARD_
19
16#include "ecore_cocoa_private.h" 20#include "ecore_cocoa_private.h"
17 21
18EAPI int ECORE_COCOA_EVENT_GOT_FOCUS = 0; 22EAPI 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 89004d2..4eda272 100644
--- a/src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h
+++ b/src/lib/ecore_cocoa/ecore_cocoa_keys.h
@@ -1,6 +1,12 @@
1#ifndef ECORE_COCOA_KEYS_H__ 1#ifndef ECORE_COCOA_KEYS_H__
2#define ECORE_COCOA_KEYS_H__ 2#define ECORE_COCOA_KEYS_H__
3 3
4/* Prevent innocent devs to include this directly. */
5#ifndef _ECORE_COCOA_KEYS_MANUAL_GUARD_
6# error This header must be be included directly!
7#endif
8
9
4struct _ecore_cocoa_keys_s 10struct _ecore_cocoa_keys_s
5{ 11{
6 int code; 12 int code;