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/eina/src/lib/eina_prefix.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 'libraries/eina/src/lib/eina_prefix.c')
-rw-r--r-- | libraries/eina/src/lib/eina_prefix.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libraries/eina/src/lib/eina_prefix.c b/libraries/eina/src/lib/eina_prefix.c index 5b4b0c0..2322311 100644 --- a/libraries/eina/src/lib/eina_prefix.c +++ b/libraries/eina/src/lib/eina_prefix.c | |||
@@ -30,15 +30,15 @@ | |||
30 | #endif | 30 | #endif |
31 | #ifdef HAVE_ALLOCA_H | 31 | #ifdef HAVE_ALLOCA_H |
32 | # include <alloca.h> | 32 | # include <alloca.h> |
33 | #elif defined __GNUC__ | 33 | #elif !defined alloca |
34 | # define alloca __builtin_alloca | 34 | # ifdef __GNUC__ |
35 | #elif defined _AIX | 35 | # define alloca __builtin_alloca |
36 | # define alloca __alloca | 36 | # elif defined _AIX |
37 | #elif defined _MSC_VER | 37 | # define alloca __alloca |
38 | # include <malloc.h> | 38 | # elif defined _MSC_VER |
39 | # define alloca _alloca | 39 | # include <malloc.h> |
40 | #else | 40 | # define alloca _alloca |
41 | # ifndef HAVE_ALLOCA | 41 | # elif !defined HAVE_ALLOCA |
42 | # ifdef __cplusplus | 42 | # ifdef __cplusplus |
43 | extern "C" | 43 | extern "C" |
44 | # endif | 44 | # endif |
@@ -237,7 +237,7 @@ _try_argv(Eina_Prefix *pfx, const char *argv0) | |||
237 | DBG("Try argv0 = %s", argv0); | 237 | DBG("Try argv0 = %s", argv0); |
238 | /* 1. is argv0 abs path? */ | 238 | /* 1. is argv0 abs path? */ |
239 | #ifdef _WIN32 | 239 | #ifdef _WIN32 |
240 | if (argv0[0] && (argv0[1] == ':')) | 240 | if (evil_path_is_absolute(argv0)) |
241 | #else | 241 | #else |
242 | if (argv0[0] == DSEP_C) | 242 | if (argv0[0] == DSEP_C) |
243 | #endif | 243 | #endif |
@@ -533,7 +533,7 @@ eina_prefix_new(const char *argv0, void *symbol, const char *envprefix, | |||
533 | { | 533 | { |
534 | DBG("Dlinfo dli_fname = %s", info_dl.dli_fname); | 534 | DBG("Dlinfo dli_fname = %s", info_dl.dli_fname); |
535 | # ifdef _WIN32 | 535 | # ifdef _WIN32 |
536 | if (info_dl.dli_fname[0] && (info_dl.dli_fname[1] == ':')) | 536 | if (evil_path_is_absolute(info_dl.dli_fname)) |
537 | # else | 537 | # else |
538 | if (info_dl.dli_fname[0] == DSEP_C) | 538 | if (info_dl.dli_fname[0] == DSEP_C) |
539 | # endif | 539 | # endif |