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/embryo/src/lib/embryo_str.c | |
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/embryo/src/lib/embryo_str.c | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/libraries/embryo/src/lib/embryo_str.c b/libraries/embryo/src/lib/embryo_str.c index 46a3284..0c2faa2 100644 --- a/libraries/embryo/src/lib/embryo_str.c +++ b/libraries/embryo/src/lib/embryo_str.c | |||
@@ -2,28 +2,41 @@ | |||
2 | # include "config.h" | 2 | # include "config.h" |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | #include <stdlib.h> | 5 | #ifdef STDC_HEADERS |
6 | #include <stdio.h> | 6 | # include <stdlib.h> |
7 | #include <string.h> | 7 | # include <stddef.h> |
8 | #include <fnmatch.h> | 8 | #else |
9 | 9 | # ifdef HAVE_STDLIB_H | |
10 | # include <stdlib.h> | ||
11 | # endif | ||
12 | #endif | ||
10 | #ifdef HAVE_ALLOCA_H | 13 | #ifdef HAVE_ALLOCA_H |
11 | # include <alloca.h> | 14 | # include <alloca.h> |
12 | #elif defined __GNUC__ | 15 | #elif !defined alloca |
13 | # define alloca __builtin_alloca | 16 | # ifdef __GNUC__ |
14 | #elif defined _AIX | 17 | # define alloca __builtin_alloca |
15 | # define alloca __alloca | 18 | # elif defined _AIX |
16 | #elif defined _MSC_VER | 19 | # define alloca __alloca |
17 | # include <malloc.h> | 20 | # elif defined _MSC_VER |
18 | # define alloca _alloca | 21 | # include <malloc.h> |
19 | #else | 22 | # define alloca _alloca |
20 | # include <stddef.h> | 23 | # elif !defined HAVE_ALLOCA |
21 | # ifdef __cplusplus | 24 | # ifdef __cplusplus |
22 | extern "C" | 25 | extern "C" |
23 | # endif | 26 | # endif |
24 | void *alloca (size_t); | 27 | void *alloca (size_t); |
28 | # endif | ||
29 | #endif | ||
30 | |||
31 | #ifdef HAVE_EXOTIC | ||
32 | # include <Exotic.h> | ||
25 | #endif | 33 | #endif |
26 | 34 | ||
35 | #include <stdlib.h> | ||
36 | #include <stdio.h> | ||
37 | #include <string.h> | ||
38 | #include <fnmatch.h> | ||
39 | |||
27 | #include "Embryo.h" | 40 | #include "Embryo.h" |
28 | #include "embryo_private.h" | 41 | #include "embryo_private.h" |
29 | 42 | ||