summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-10 02:18:10 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-10 02:18:10 +0000
commit532284dbbe4259a9f2291f44d3eff376849e8031 (patch)
tree17ea441edf31210f852f2067f23d41320d52eefa /src/lib/ecore_evas
parent7b0ae69adcb1314c3b2a87f69d7634e357820d1c (diff)
efl: forward typedef to avoid including useless headers.
do not include Ecore_Input.h just to get Ecore_Window and Ecore_Getopt to get handful typedefs. NOTE: why do we have the #ifdefs around these predefs? At least GCC does not warn if we typedef twice the same thing (if they are identical) SVN revision: 82499
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/Ecore_Evas.h2
-rw-r--r--src/lib/ecore_evas/Ecore_Evas_Types.h23
-rw-r--r--src/lib/ecore_evas/ecore_evas_util.c1
3 files changed, 24 insertions, 2 deletions
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 9792e07e61..2393e313ee 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -4,8 +4,6 @@
4#include "Ecore_Evas_Types.h" 4#include "Ecore_Evas_Types.h"
5 5
6#include <Evas.h> 6#include <Evas.h>
7#include <Ecore_Getopt.h>
8#include <Ecore_Input.h>
9 7
10#ifdef EAPI 8#ifdef EAPI
11# undef EAPI 9# undef EAPI
diff --git a/src/lib/ecore_evas/Ecore_Evas_Types.h b/src/lib/ecore_evas/Ecore_Evas_Types.h
index 395c4c016f..b819e85adc 100644
--- a/src/lib/ecore_evas/Ecore_Evas_Types.h
+++ b/src/lib/ecore_evas/Ecore_Evas_Types.h
@@ -1,6 +1,12 @@
1#ifndef _ECORE_EVAS_TYPES_H_ 1#ifndef _ECORE_EVAS_TYPES_H_
2#define _ECORE_EVAS_TYPES_H_ 2#define _ECORE_EVAS_TYPES_H_
3 3
4#ifdef _WIN32
5# include <stddef.h>
6#else
7# include <inttypes.h>
8#endif
9
4#ifndef _ECORE_X_H 10#ifndef _ECORE_X_H
5#define _ECORE_X_WINDOW_PREDEF 11#define _ECORE_X_WINDOW_PREDEF
6typedef unsigned int Ecore_X_Window; 12typedef unsigned int Ecore_X_Window;
@@ -34,5 +40,22 @@ typedef void (*Ecore_Evas_Event_Cb) (Ecore_Evas *ee); /**< Callback used for s
34typedef struct _Ecore_Wl_Window Ecore_Wl_Window; 40typedef struct _Ecore_Wl_Window Ecore_Wl_Window;
35#endif 41#endif
36 42
43#ifndef _ECORE_GETOPT_PREDEF
44typedef struct _Ecore_Getopt Ecore_Getopt;
45#define _ECORE_GETOPT_PREDEF 1
46#endif
47#ifndef _ECORE_GETOPT_DESC_PREDEF
48typedef struct _Ecore_Getopt_Desc Ecore_Getopt_Desc;
49#define _ECORE_GETOPT_DESC_PREDEF 1
50#endif
51#ifndef _ECORE_GETOPT_VALUE_PREDEF
52typedef union _Ecore_Getopt_Value Ecore_Getopt_Value;
53#define _ECORE_GETOPT_VALUE_PREDEF 1
54#endif
55
56#ifndef _ECORE_WINDOW_PREDEF
57typedef uintptr_t Ecore_Window;
58#define _ECORE_WINDOW_PREDEF 1
59#endif
37 60
38#endif /* _ECORE_EVAS_TYPES_H_ */ 61#endif /* _ECORE_EVAS_TYPES_H_ */
diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 85ff2bd37f..86745c9be3 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -6,6 +6,7 @@
6#include <string.h> 6#include <string.h>
7 7
8#include <Ecore.h> 8#include <Ecore.h>
9#include <Ecore_Getopt.h>
9#include "ecore_private.h" 10#include "ecore_private.h"
10 11
11#include "ecore_evas_private.h" 12#include "ecore_evas_private.h"