1
0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-23 03:02:53 +01:00

Merge pull request #1552 from danilaml/fixes

Fixes for #1550 and #1546
This commit is contained in:
vlj 2016-03-07 20:10:59 +01:00
commit 4b0b65c0c5
2 changed files with 2 additions and 2 deletions

View File

@ -23,7 +23,7 @@
#if defined(_MSC_VER)
#define force_inline __forceinline
#else
#define force_inline __attribute__((always_inline))
#define force_inline __attribute__((always_inline)) inline
#endif
#if defined(_MSC_VER) && _MSC_VER <= 1800

@ -1 +1 @@
Subproject commit 6c292d3ba78533fed7b5ec46bb93b53419cf6535
Subproject commit 3c5b1e6b31aca0eb52fe7e82a963ff735f1de31b