diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/lib/include/evas_common.h | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/lib/include/evas_common.h | 92 |
1 files changed, 53 insertions, 39 deletions
diff --git a/libraries/evas/src/lib/include/evas_common.h b/libraries/evas/src/lib/include/evas_common.h index a9063e6..e853064 100644 --- a/libraries/evas/src/lib/include/evas_common.h +++ b/libraries/evas/src/lib/include/evas_common.h | |||
@@ -5,6 +5,45 @@ | |||
5 | #include "config.h" /* so that EAPI in Evas.h is correctly defined */ | 5 | #include "config.h" /* so that EAPI in Evas.h is correctly defined */ |
6 | //#endif | 6 | //#endif |
7 | 7 | ||
8 | #ifdef STDC_HEADERS | ||
9 | # include <stdlib.h> | ||
10 | # include <stddef.h> | ||
11 | #else | ||
12 | # ifdef HAVE_STDLIB_H | ||
13 | # include <stdlib.h> | ||
14 | # endif | ||
15 | #endif | ||
16 | #ifdef HAVE_ALLOCA_H | ||
17 | # include <alloca.h> | ||
18 | #elif !defined alloca | ||
19 | # ifdef __GNUC__ | ||
20 | # define alloca __builtin_alloca | ||
21 | # elif defined _AIX | ||
22 | # define alloca __alloca | ||
23 | # elif defined _MSC_VER | ||
24 | # include <malloc.h> | ||
25 | # define alloca _alloca | ||
26 | # elif !defined HAVE_ALLOCA | ||
27 | # ifdef __cplusplus | ||
28 | extern "C" | ||
29 | # endif | ||
30 | void *alloca (size_t); | ||
31 | # endif | ||
32 | #endif | ||
33 | |||
34 | #include <stdio.h> | ||
35 | #include <stdlib.h> | ||
36 | #include <string.h> | ||
37 | #include <sys/types.h> | ||
38 | #include <sys/stat.h> | ||
39 | #include <time.h> | ||
40 | #include <ctype.h> | ||
41 | |||
42 | #ifndef _MSC_VER | ||
43 | # include <stdint.h> | ||
44 | #include <unistd.h> | ||
45 | #endif | ||
46 | |||
8 | #ifdef HAVE_EVIL | 47 | #ifdef HAVE_EVIL |
9 | # include <Evil.h> | 48 | # include <Evil.h> |
10 | #endif | 49 | #endif |
@@ -13,10 +52,6 @@ | |||
13 | # include <Escape.h> | 52 | # include <Escape.h> |
14 | #endif | 53 | #endif |
15 | 54 | ||
16 | #include <Eina.h> | ||
17 | #include "Evas.h" | ||
18 | //#include "Evas_GL.h" | ||
19 | |||
20 | #ifdef HAVE_PIXMAN | 55 | #ifdef HAVE_PIXMAN |
21 | #include <pixman.h> | 56 | #include <pixman.h> |
22 | #endif | 57 | #endif |
@@ -25,6 +60,14 @@ | |||
25 | #include <sys/stat.h> | 60 | #include <sys/stat.h> |
26 | #include <unistd.h> | 61 | #include <unistd.h> |
27 | 62 | ||
63 | #ifdef HAVE_EXOTIC | ||
64 | # include <Exotic.h> | ||
65 | #endif | ||
66 | |||
67 | #include <Eina.h> | ||
68 | #include "Evas.h" | ||
69 | //#include "Evas_GL.h" | ||
70 | |||
28 | #ifndef HAVE_LROUND | 71 | #ifndef HAVE_LROUND |
29 | /* right now i dont care about rendering bugs on platforms without lround | 72 | /* right now i dont care about rendering bugs on platforms without lround |
30 | (e.g. windows/vc++... yay!) | 73 | (e.g. windows/vc++... yay!) |
@@ -171,35 +214,6 @@ extern EAPI int _evas_log_dom_global; | |||
171 | 214 | ||
172 | #endif | 215 | #endif |
173 | 216 | ||
174 | #ifdef HAVE_ALLOCA_H | ||
175 | # include <alloca.h> | ||
176 | #elif defined __GNUC__ | ||
177 | # define alloca __builtin_alloca | ||
178 | #elif defined _AIX | ||
179 | # define alloca __alloca | ||
180 | #elif defined _MSC_VER | ||
181 | # include <malloc.h> | ||
182 | # define alloca _alloca | ||
183 | #else | ||
184 | # include <stddef.h> | ||
185 | # ifdef __cplusplus | ||
186 | extern "C" | ||
187 | # endif | ||
188 | void *alloca (size_t); | ||
189 | #endif | ||
190 | |||
191 | #include <stdio.h> | ||
192 | #include <stdlib.h> | ||
193 | #include <string.h> | ||
194 | #include <sys/types.h> | ||
195 | #include <sys/stat.h> | ||
196 | #include <time.h> | ||
197 | #include <ctype.h> | ||
198 | |||
199 | #ifndef _MSC_VER | ||
200 | # include <stdint.h> | ||
201 | #endif | ||
202 | |||
203 | #include <ft2build.h> | 217 | #include <ft2build.h> |
204 | #include FT_FREETYPE_H | 218 | #include FT_FREETYPE_H |
205 | #include FT_GLYPH_H | 219 | #include FT_GLYPH_H |
@@ -1005,12 +1019,12 @@ struct list | |||
1005 | 1019 | ||
1006 | struct rect | 1020 | struct rect |
1007 | { | 1021 | { |
1008 | short left; | 1022 | int left; |
1009 | short top; | 1023 | int top; |
1010 | short right; | 1024 | int right; |
1011 | short bottom; | 1025 | int bottom; |
1012 | short width; | 1026 | int width; |
1013 | short height; | 1027 | int height; |
1014 | int area; | 1028 | int area; |
1015 | }; | 1029 | }; |
1016 | 1030 | ||