diff options
| author | 2014-08-17 20:32:04 -0400 | |
|---|---|---|
| committer | 2014-08-17 20:32:04 -0400 | |
| commit | b26f25356d4463b5e4ccd36cf7365342d7306e7f (patch) | |
| tree | 1cbe356089890c22e3f1e4084891f306d6e62d97 /src/common/thread.h | |
| parent | Merge pull request #53 from lioncash/memmap (diff) | |
| parent | Common: Move remaining C header includes over to their C++ equivalent (diff) | |
| download | yuzu-b26f25356d4463b5e4ccd36cf7365342d7306e7f.tar.gz yuzu-b26f25356d4463b5e4ccd36cf7365342d7306e7f.tar.xz yuzu-b26f25356d4463b5e4ccd36cf7365342d7306e7f.zip | |
Merge pull request #51 from lioncash/pragma
Common: Move header guards over to pragma once.
Diffstat (limited to 'src/common/thread.h')
| -rw-r--r-- | src/common/thread.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/common/thread.h b/src/common/thread.h index d72ac7b47..dbb9da53b 100644 --- a/src/common/thread.h +++ b/src/common/thread.h | |||
| @@ -2,8 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 | 2 | // Licensed under GPLv2 |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #ifndef _THREAD_H_ | 5 | #pragma once |
| 6 | #define _THREAD_H_ | ||
| 7 | 6 | ||
| 8 | #include "common/std_condition_variable.h" | 7 | #include "common/std_condition_variable.h" |
| 9 | #include "common/std_mutex.h" | 8 | #include "common/std_mutex.h" |
| @@ -11,8 +10,8 @@ | |||
| 11 | 10 | ||
| 12 | // Don't include common.h here as it will break LogManager | 11 | // Don't include common.h here as it will break LogManager |
| 13 | #include "common/common_types.h" | 12 | #include "common/common_types.h" |
| 14 | #include <stdio.h> | 13 | #include <cstdio> |
| 15 | #include <string.h> | 14 | #include <cstring> |
| 16 | 15 | ||
| 17 | // This may not be defined outside _WIN32 | 16 | // This may not be defined outside _WIN32 |
| 18 | #ifndef _WIN32 | 17 | #ifndef _WIN32 |
| @@ -152,5 +151,3 @@ inline void YieldCPU() | |||
| 152 | void SetCurrentThreadName(const char *name); | 151 | void SetCurrentThreadName(const char *name); |
| 153 | 152 | ||
| 154 | } // namespace Common | 153 | } // namespace Common |
| 155 | |||
| 156 | #endif // _THREAD_H_ | ||