diff options
| author | 2019-03-25 23:13:40 +0100 | |
|---|---|---|
| committer | 2019-03-25 23:13:40 +0100 | |
| commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
| tree | 63c8012e262618f08a332da31dd714281aa2c5ed /3rdparty/softfloat3 | |
| parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) | |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to '3rdparty/softfloat3')
| -rw-r--r-- | 3rdparty/softfloat3/build/MAME/platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/3rdparty/softfloat3/build/MAME/platform.h b/3rdparty/softfloat3/build/MAME/platform.h index 5dfa704955c..96fc81e348e 100644 --- a/3rdparty/softfloat3/build/MAME/platform.h +++ b/3rdparty/softfloat3/build/MAME/platform.h @@ -54,7 +54,7 @@ Softfloat 3 MAME modifications /*---------------------------------------------------------------------------- *----------------------------------------------------------------------------*/ -#if defined(_MSC_VER) && !defined(__clang__) +#if defined(_MSC_VER) #define _INC_MALLOC 0 #include <intrin.h> |
