diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-08-11 21:26:14 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-08-11 21:26:14 +0000 |
| commit | 53721fa8df523400333a79a218899a9a3de793d2 (patch) | |
| tree | d9829035c8a869fe804d1618dc4e08fc4c8d210f /navit/support/wordexp/wordexp.c | |
| parent | 66b0fda8d8130252169e7761c5a80c5edd7affcb (diff) | |
| download | navit-53721fa8df523400333a79a218899a9a3de793d2.tar.gz | |
Add:Core:More android work
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2459 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/support/wordexp/wordexp.c')
| -rw-r--r-- | navit/support/wordexp/wordexp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/navit/support/wordexp/wordexp.c b/navit/support/wordexp/wordexp.c index d4ad44a9f..bacaea57c 100644 --- a/navit/support/wordexp/wordexp.c +++ b/navit/support/wordexp/wordexp.c @@ -85,7 +85,9 @@ wordexp(const char *words, wordexp_t *we, int flags) int i; int error; char *words_expanded; +#ifdef HAVE_API_WIN32_BASE glob_t pglob; +#endif assert(we != NULL); assert(words != NULL); @@ -93,6 +95,7 @@ wordexp(const char *words, wordexp_t *we, int flags) /* expansion of ´$NAME´ or ´${NAME}´ */ words_expanded=expand_variables(words); +#ifdef HAVE_API_WIN32_BASE /* expansion of ´*´, ´?´ */ error=glob(words_expanded, 0, NULL, &pglob); if (!error) @@ -110,10 +113,13 @@ wordexp(const char *words, wordexp_t *we, int flags) } else { +#endif we->we_wordc = 1; we->we_wordv = malloc(sizeof(char*)); we->we_wordv[0] = words_expanded; +#ifdef HAVE_API_WIN32_BASE } +#endif return error; |