diff options
| author |  bunnei | 2015-02-03 12:40:16 -0500 |
|---|---|---|
| committer | bunnei | 2015-02-03 12:40:16 -0500 |
| commit | d64c836369ec2feae8a39c883a832692a8239bad (patch) | |
| tree | 3c7d78bb2e4666cb7a11cfb7f57f61b8710ca07d /src/core/loader | |
| parent | Merge pull request #523 from yuriks/kernel-lifetime5 (diff) | |
| parent | core: Fix some warnings on OSX (diff) | |
| download | yuzu-d64c836369ec2feae8a39c883a832692a8239bad.tar.gz yuzu-d64c836369ec2feae8a39c883a832692a8239bad.tar.xz yuzu-d64c836369ec2feae8a39c883a832692a8239bad.zip | |
Merge pull request #532 from lioncash/warn
core: Fix some warnings on OSX
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/loader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 7456b019b..3510c6b28 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -38,7 +38,7 @@ enum class ResultStatus { | |||
| 38 | ErrorMemoryAllocationFailed, | 38 | ErrorMemoryAllocationFailed, |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | static u32 MakeMagic(char a, char b, char c, char d) { | 41 | static inline u32 MakeMagic(char a, char b, char c, char d) { |
| 42 | return a | b << 8 | c << 16 | d << 24; | 42 | return a | b << 8 | c << 16 | d << 24; |
| 43 | } | 43 | } |
| 44 | 44 | ||