diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-20 23:24:01 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-28 01:36:53 +0200 |
| commit | 8cf9eb7f431e235a39f380118cfd081a604ea1c9 (patch) | |
| tree | 40fb32350e16c85e65c44b121f8cf37d11ba6f13 /src/common | |
| parent | Citra: Fix the includes a bit, thanks to include-what-you-use. (diff) | |
| download | yuzu-8cf9eb7f431e235a39f380118cfd081a604ea1c9.tar yuzu-8cf9eb7f431e235a39f380118cfd081a604ea1c9.tar.gz yuzu-8cf9eb7f431e235a39f380118cfd081a604ea1c9.tar.bz2 yuzu-8cf9eb7f431e235a39f380118cfd081a604ea1c9.tar.lz yuzu-8cf9eb7f431e235a39f380118cfd081a604ea1c9.tar.xz yuzu-8cf9eb7f431e235a39f380118cfd081a604ea1c9.tar.zst yuzu-8cf9eb7f431e235a39f380118cfd081a604ea1c9.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/common/chunk_file.h | 7 | ||||
| -rw-r--r-- | src/common/file_util.cpp | 11 | ||||
| -rw-r--r-- | src/common/file_util.h | 3 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index dcd80525e..ee9f3d7c0 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h @@ -26,13 +26,14 @@ // - Zero backwards/forwards compatibility // - Serialization code for anything complex has to be manually written. -#include <map> -#include <vector> +#include <cstring> #include <deque> -#include <string> #include <list> +#include <map> #include <set> +#include <string> #include <type_traits> +#include <vector> #include "common/common_types.h" #include "common/file_util.h" diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 24648ea33..836b58d52 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -17,6 +17,8 @@ #include <direct.h> // getcwd #include <tchar.h> + #include "common/string_util.h" + // 64 bit offsets for windows #define fseeko _fseeki64 #define ftello _ftelli64 @@ -25,8 +27,13 @@ #define fstat64 _fstat64 #define fileno _fileno #else - #include <sys/param.h> - #include <sys/types.h> + #ifdef __APPLE__ + #include <sys/param.h> + #endif + #include <cctype> + #include <cerrno> + #include <cstdlib> + #include <cstring> #include <dirent.h> #include <pwd.h> #include <unistd.h> diff --git a/src/common/file_util.h b/src/common/file_util.h index b65829291..8fe772aee 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -6,13 +6,12 @@ #include <array> #include <fstream> +#include <cstddef> #include <cstdio> -#include <cstring> #include <string> #include <vector> #include "common/common_types.h" -#include "common/string_util.h" // User directory indices for GetUserPath enum { |