Showing the changes to src/core/util_string.cpp (1 of 1 file). Show all
Unified · Split
| @@ -361,7 +361,7 @@ done: · 360 unmodified lines | ||
| 361 | 361 | |
| 362 | 362 | /* from http://developer.apple.com/library/mac/#qa/qa1549/_index.html */ |
| 363 | 363 | |
| 364 | −#if !defined(__PLATFORM_WIN32__) && !defined(__EMSCRIPTEN__) | |
| 364 | +#if !defined(__PLATFORM_WIN32__) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) | |
| 365 | 365 | |
| 366 | 366 | #include <glob.h> |
| 367 | 367 | |
| @@ -389,7 +389,7 @@ char* CreatePathByExpandingTildePath(const char* path) · 21 unmodified lines | ||
| 389 | 389 | return result; |
| 390 | 390 | } |
| 391 | 391 | |
| 392 | −#endif // __PLATFORM_WIN32__ && __EMSCRIPTEN__ | |
| 392 | +#endif // __PLATFORM_WIN32__ && __EMSCRIPTEN__ && __ANDROID__ | |
| 393 | 393 | |
| 394 | 394 | |
| 395 | 395 | // get full path to file |
| @@ -431,8 +431,8 @@ std::string get_full_path( const std::string & fp ) · 35 unmodified lines | ||
| 431 | 431 | |
| 432 | 432 | std::string expand_filepath( std::string & fp ) |
| 433 | 433 | { |
| 434 | −#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) || defined(__EMSCRIPTEN__) | |
| 435 | − // no expansion in Windows systems or Emscripten | |
| 434 | +#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) || defined(__EMSCRIPTEN__) || defined(__ANDROID__) | |
| 435 | + // no expansion in Windows systems or Emscripten or Android | |
| 436 | 436 | return fp; |
| 437 | 437 | #else |
| 438 | 438 | |