summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/softfloat3/build
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
commitc24473ddff715ecec2e258a6eb38960cf8c8e98e (patch)
tree8ea44b6396a6129913c0aac13859b5de9965e972 /3rdparty/softfloat3/build
parent009cba4fb8102102168ef32870892438327f3705 (diff)
parent598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff)
conflict resolution (nw)
Diffstat (limited to '3rdparty/softfloat3/build')
-rw-r--r--3rdparty/softfloat3/build/MAME/platform.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/3rdparty/softfloat3/build/MAME/platform.h b/3rdparty/softfloat3/build/MAME/platform.h
index 96fc81e348e..5dfa704955c 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)
+#if defined(_MSC_VER) && !defined(__clang__)
#define _INC_MALLOC 0
#include <intrin.h>