diff options
| author | Jannik Vogel <email@jannikvogel.de> | 2016-12-03 21:08:02 +0100 |
|---|---|---|
| committer | Jannik Vogel <email@jannikvogel.de> | 2016-12-05 19:09:16 +0100 |
| commit | 45d941d62e2accea92f5b5183afe760e69a618ac (patch) | |
| tree | 123b8c13185b472a1fa413c3b8caf42980106207 /src/common | |
| parent | Merge pull request #2269 from Subv/update_dynarmic (diff) | |
| download | yuzu-45d941d62e2accea92f5b5183afe760e69a618ac.tar yuzu-45d941d62e2accea92f5b5183afe760e69a618ac.tar.gz yuzu-45d941d62e2accea92f5b5183afe760e69a618ac.tar.bz2 yuzu-45d941d62e2accea92f5b5183afe760e69a618ac.tar.lz yuzu-45d941d62e2accea92f5b5183afe760e69a618ac.tar.xz yuzu-45d941d62e2accea92f5b5183afe760e69a618ac.tar.zst yuzu-45d941d62e2accea92f5b5183afe760e69a618ac.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/bit_set.h | 2 | ||||
| -rw-r--r-- | src/common/logging/text_formatter.cpp | 2 | ||||
| -rw-r--r-- | src/common/string_util.cpp | 2 | ||||
| -rw-r--r-- | src/common/thread.cpp | 2 | ||||
| -rw-r--r-- | src/common/timer.cpp | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/common/bit_set.h b/src/common/bit_set.h index c48b3b769..3059d0cb0 100644 --- a/src/common/bit_set.h +++ b/src/common/bit_set.h @@ -16,7 +16,7 @@ namespace Common { // Helper functions: -#ifdef _WIN32 +#ifdef _MSC_VER template <typename T> static inline int CountSetBits(T v) { // from https://graphics.stanford.edu/~seander/bithacks.html diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp index d61c1696b..9d423766f 100644 --- a/src/common/logging/text_formatter.cpp +++ b/src/common/logging/text_formatter.cpp @@ -7,7 +7,7 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN -#include <Windows.h> +#include <windows.h> #endif #include "common/assert.h" diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index df1008180..bad311793 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -14,7 +14,7 @@ #ifdef _WIN32 #include <codecvt> -#include <Windows.h> +#include <windows.h> #include "common/common_funcs.h" #else #include <iconv.h> diff --git a/src/common/thread.cpp b/src/common/thread.cpp index 9bb2f4e1d..9e207118f 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp @@ -6,7 +6,7 @@ #ifdef __APPLE__ #include <mach/mach.h> #elif defined(_WIN32) -#include <Windows.h> +#include <windows.h> #else #if defined(__Bitrig__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) #include <pthread_np.h> diff --git a/src/common/timer.cpp b/src/common/timer.cpp index e843cbd9c..c9803109e 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -4,7 +4,8 @@ #include <time.h> #ifdef _WIN32 -#include <Windows.h> +#include <windows.h> +// windows.h needs to be included before other windows headers #include <mmsystem.h> #include <sys/timeb.h> #else |