summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/file_util.cpp2
-rw-r--r--src/common/swap.h26
2 files changed, 14 insertions, 14 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index d36304d91..47ad964db 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -672,7 +672,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
else
paths[D_USER_IDX] = std::string(getenv("HOME") ?
getenv("HOME") : getenv("PWD") ?
- getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
+ getenv("PWD") : "") + DIR_SEP EMU_DATA_DIR DIR_SEP;
#endif
paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
diff --git a/src/common/swap.h b/src/common/swap.h
index d07d9fcc5..123019fd1 100644
--- a/src/common/swap.h
+++ b/src/common/swap.h
@@ -497,27 +497,27 @@ typedef s64 s64_le;
typedef float float_le;
typedef double double_le;
-typedef swap_struct_t<u64, swap_64_t<u64>> u64_be;
-typedef swap_struct_t<s64, swap_64_t<s64>> s64_be;
+typedef swap_struct_t<u64, swap_64_t<u64> > u64_be;
+typedef swap_struct_t<s64, swap_64_t<s64> > s64_be;
-typedef swap_struct_t<u32, swap_32_t<u32>> u32_be;
-typedef swap_struct_t<s32, swap_32_t<s32>> s32_be;
+typedef swap_struct_t<u32, swap_32_t<u32> > u32_be;
+typedef swap_struct_t<s32, swap_32_t<s32> > s32_be;
-typedef swap_struct_t<u16, swap_16_t<u16>> u16_be;
-typedef swap_struct_t<s16, swap_16_t<s16>> s16_be;
+typedef swap_struct_t<u16, swap_16_t<u16> > u16_be;
+typedef swap_struct_t<s16, swap_16_t<s16> > s16_be;
typedef swap_struct_t<float, swap_float_t<float> > float_be;
typedef swap_struct_t<double, swap_double_t<double> > double_be;
#else
-typedef swap_struct_t<u64, swap_64_t<u64>> u64_le;
-typedef swap_struct_t<s64, swap_64_t<s64>> s64_le;
+typedef swap_struct_t<u64, swap_64_t<u64> > u64_le;
+typedef swap_struct_t<s64, swap_64_t<s64> > s64_le;
-typedef swap_struct_t<u32, swap_32_t<u32>> u32_le;
-typedef swap_struct_t<s32, swap_32_t<s32>> s32_le;
+typedef swap_struct_t<u32, swap_32_t<u32> > u32_le;
+typedef swap_struct_t<s32, swap_32_t<s32> > s32_le;
-typedef swap_struct_t<u16, swap_16_t<u16>> u16_le;
-typedef swap_struct_t<s16, swap_16_t<s16>> s16_le;
+typedef swap_struct_t<u16, swap_16_t<u16> > u16_le;
+typedef swap_struct_t< s16, swap_16_t<s16> > s16_le;
typedef swap_struct_t<float, swap_float_t<float> > float_le;
typedef swap_struct_t<double, swap_double_t<double> > double_le;
@@ -532,4 +532,4 @@ typedef s64 s64_be;
typedef float float_be;
typedef double double_be;
-#endif \ No newline at end of file
+#endif