diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
| commit | db1e60556c72b1b87ff2a384c556ccca724c46d6 (patch) | |
| tree | 22a5f4e9c4f436ef8e746e0a2d688de80c1597a6 /src/utils/files.h | |
| parent | c2bb49be52a92deccec7428b6859242688fc8987 (diff) | |
| parent | 1716861f0ee2f7a3714c5b44bb0f017c3d8d3b2c (diff) | |
| download | plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.gz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.bz2 plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.xz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/utils/files.h')
| -rw-r--r-- | src/utils/files.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/utils/files.h b/src/utils/files.h index bb9a6a11f..f356d7688 100644 --- a/src/utils/files.h +++ b/src/utils/files.h @@ -21,12 +21,18 @@ #ifndef UTILS_FILES_H #define UTILS_FILES_H -#ifdef ANDROID #include <string> namespace Files { +#ifdef ANDROID void extractLocale(); +#endif + +#if defined(ANDROID) || defined(__native_client__) + typedef void (*CopyFileCallbackPtr) (int cnt); + + void setCopyCallBack(CopyFileCallbackPtr callback); void copyPhysFsFile(const std::string &inFile, const std::string &outFile); @@ -34,7 +40,9 @@ namespace Files void extractZip(const std::string &zipName, const std::string &inDir, const std::string &outDir); +#endif // ANDROID __native_client__ + + int renameFile(const std::string &pFrom, const std::string &pTo); } // namespace Files -#endif // ANDROID #endif // UTILS_FILES_H |