summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authordarkf <lw9k123@gmail.com>2015-08-16 08:41:40 +0200
committerdarkf <lw9k123@gmail.com>2015-08-18 07:21:14 +0200
commite053d30bf75f311778ad745f7859a9733d6ce2e3 (patch)
treedd10a8b2f513d5d4245549e259c0a05308e694bb /src/common
parentMerge pull request #1017 from LittleWhite-tb/qt-recent-files (diff)
downloadyuzu-e053d30bf75f311778ad745f7859a9733d6ce2e3.tar
yuzu-e053d30bf75f311778ad745f7859a9733d6ce2e3.tar.gz
yuzu-e053d30bf75f311778ad745f7859a9733d6ce2e3.tar.bz2
yuzu-e053d30bf75f311778ad745f7859a9733d6ce2e3.tar.lz
yuzu-e053d30bf75f311778ad745f7859a9733d6ce2e3.tar.xz
yuzu-e053d30bf75f311778ad745f7859a9733d6ce2e3.tar.zst
yuzu-e053d30bf75f311778ad745f7859a9733d6ce2e3.zip
Diffstat (limited to '')
-rw-r--r--src/common/common_funcs.h12
-rw-r--r--src/common/file_util.h2
2 files changed, 10 insertions, 4 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 88e452a16..ed20c3629 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -45,14 +45,20 @@
// GCC 4.8 defines all the rotate functions now
// Small issue with GCC's lrotl/lrotr intrinsics is they are still 32bit while we require 64bit
-#ifndef _rotl
-inline u32 _rotl(u32 x, int shift) {
+#ifdef _rotl
+#define rotl _rotl
+#else
+inline u32 rotl(u32 x, int shift) {
shift &= 31;
if (!shift) return x;
return (x << shift) | (x >> (32 - shift));
}
+#endif
-inline u32 _rotr(u32 x, int shift) {
+#ifdef _rotr
+#define rotr _rotr
+#else
+inline u32 rotr(u32 x, int shift) {
shift &= 31;
if (!shift) return x;
return (x >> shift) | (x << (32 - shift));
diff --git a/src/common/file_util.h b/src/common/file_util.h
index d0dccdf69..e71a9b2fa 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -244,7 +244,7 @@ private:
template <typename T>
void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode)
{
-#ifdef _WIN32
+#ifdef _MSC_VER
fstream.open(Common::UTF8ToTStr(filename).c_str(), openmode);
#else
fstream.open(filename.c_str(), openmode);