diff options
| author |  Morph | 2021-09-12 12:01:23 -0400 |
|---|---|---|
| committer |  GitHub | 2021-09-12 12:01:23 -0400 |
| commit | 74030eb4277c179c62189a978b693e081bfe7c4c (patch) | |
| tree | e2f4ba2fa65f8b9bdfbd86352a65539f46d9193f /src/common/thread.cpp | |
| parent | Merge pull request #6986 from Morph1984/version-update (diff) | |
| parent | shader_environment: Add missing <algorithm> include (diff) | |
| download | yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.gz yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.xz yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.zip | |
Merge pull request #6987 from Morph1984/common-error
common: Move error handling functions out of common_funcs
Diffstat (limited to 'src/common/thread.cpp')
| -rw-r--r-- | src/common/thread.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/thread.cpp b/src/common/thread.cpp index d2c1ac60d..946a1114d 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp | |||
| @@ -2,7 +2,9 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/common_funcs.h" | 5 | #include <string> |
| 6 | |||
| 7 | #include "common/error.h" | ||
| 6 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 7 | #include "common/thread.h" | 9 | #include "common/thread.h" |
| 8 | #ifdef __APPLE__ | 10 | #ifdef __APPLE__ |
| @@ -21,8 +23,6 @@ | |||
| 21 | #include <unistd.h> | 23 | #include <unistd.h> |
| 22 | #endif | 24 | #endif |
| 23 | 25 | ||
| 24 | #include <string> | ||
| 25 | |||
| 26 | #ifdef __FreeBSD__ | 26 | #ifdef __FreeBSD__ |
| 27 | #define cpu_set_t cpuset_t | 27 | #define cpu_set_t cpuset_t |
| 28 | #endif | 28 | #endif |