You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

21 lines
567 B

  1. --- a/ibrcommon/data/File.cpp
  2. +++ b/ibrcommon/data/File.cpp
  3. @@ -35,9 +35,7 @@
  4. #include <cerrno>
  5. #include <fstream>
  6. -#if !defined(HAVE_FEATURES_H) || defined(ANDROID)
  7. #include <libgen.h>
  8. -#endif
  9. #ifdef __WIN32__
  10. #include <io.h>
  11. @@ -226,7 +224,7 @@ namespace ibrcommon
  12. std::string File::getBasename() const
  13. {
  14. #if !defined(ANDROID) && defined(HAVE_FEATURES_H)
  15. - return std::string(basename(_path.c_str()));
  16. + return std::string(basename((char *)_path.c_str()));
  17. #else
  18. char path[_path.length()+1];
  19. ::memcpy(&path, _path.c_str(), _path.length()+1);