diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-17 18:11:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-17 18:11:01 +0300 |
| commit | a5839feb970329b57dfeae022f78ffe0b1e73d1e (patch) | |
| tree | ab246d73b5106918d9bc2e42f18f1c7ca96a98be | |
| parent | 4d2ed2cd6e1db91760ea5a002540c300d01b30a3 (diff) | |
| download | manaverse-a5839feb970329b57dfeae022f78ffe0b1e73d1e.tar.gz manaverse-a5839feb970329b57dfeae022f78ffe0b1e73d1e.tar.bz2 manaverse-a5839feb970329b57dfeae022f78ffe0b1e73d1e.tar.xz manaverse-a5839feb970329b57dfeae022f78ffe0b1e73d1e.zip | |
Fix code style.
also fix compilation for android and nacl.
| -rw-r--r-- | src/utils/files.cpp | 1 | ||||
| -rw-r--r-- | src/utils/virtfs.cpp | 4 | ||||
| -rw-r--r-- | src/utils/virtfstools.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/utils/files.cpp b/src/utils/files.cpp index deb3acb79..da7270364 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -31,6 +31,7 @@ #include "utils/paths.h" #include "utils/virtfs.h" #include "utils/virtfstools.h" +#include "utils/virtlist.h" #endif // defined(ANDROID) || defined(__native_client__) #include <dirent.h> diff --git a/src/utils/virtfs.cpp b/src/utils/virtfs.cpp index fdcdab6d6..cf1d353b6 100644 --- a/src/utils/virtfs.cpp +++ b/src/utils/virtfs.cpp @@ -88,11 +88,11 @@ namespace VirtFs VirtList *enumerateFiles(const std::string &restrict dir) { - char** handle = PHYSFS_enumerateFiles(dir.c_str()); + char ** handle = PHYSFS_enumerateFiles(dir.c_str()); VirtList *const files = new VirtList; if (handle == nullptr) return files; - for (char **i = handle; *i; i++) + for (const char *const *i = handle; *i; i++) { std::string str = *i; files->names.push_back(str); diff --git a/src/utils/virtfstools.h b/src/utils/virtfstools.h index f678d1e52..4f2a77f4c 100644 --- a/src/utils/virtfstools.h +++ b/src/utils/virtfstools.h @@ -27,8 +27,6 @@ #include "localconsts.h" -struct VirtFile; - namespace VirtFs { void *loadFile(const std::string &restrict fileName, |