summaryrefslogtreecommitdiff
path: root/msvc_extra_headers
diff options
context:
space:
mode:
Diffstat (limited to 'msvc_extra_headers')
-rw-r--r--msvc_extra_headers/ardourext/misc.h.input2
-rw-r--r--msvc_extra_headers/ardourext/sys/targetsxs.h.input2
2 files changed, 4 insertions, 0 deletions
diff --git a/msvc_extra_headers/ardourext/misc.h.input b/msvc_extra_headers/ardourext/misc.h.input
index 47cff56295..a5f4e9e95c 100644
--- a/msvc_extra_headers/ardourext/misc.h.input
+++ b/msvc_extra_headers/ardourext/misc.h.input
@@ -196,6 +196,7 @@ typedef _mode_t mode_t;
#endif /* _MODE_T_ */
// int64 abs()
+#if (defined(_MSC_VER) && (_MSC_VER < 1500))
#ifdef __cplusplus // Normal 'C' doesn't permit over-ridden functions !!
inline int64_t abs(int64_t val) throw()
{
@@ -205,6 +206,7 @@ inline int64_t abs(int64_t val) throw()
return val;
}
#endif
+#endif
// fmin() and fmax()
#define fmin(a, b) min((double)a, (double)b)
diff --git a/msvc_extra_headers/ardourext/sys/targetsxs.h.input b/msvc_extra_headers/ardourext/sys/targetsxs.h.input
index 24d1b29ab3..aa09700241 100644
--- a/msvc_extra_headers/ardourext/sys/targetsxs.h.input
+++ b/msvc_extra_headers/ardourext/sys/targetsxs.h.input
@@ -34,6 +34,7 @@
#define RDC_BUILD 1
#endif
+#if (defined (_MSC_VER) && (_MSC_VER == 1400))
#ifndef __midl
#if defined(_DEBUG) || defined (DEBUG)
/* Experimental - link to the lowest DebugCRT so we can run on another system */
@@ -58,6 +59,7 @@ __declspec(selectany) int _forceAtlDllManifestRTM;
}
#endif
#endif
+#endif
/* 'stdint.h' conflicts with various other libraries so
let's #include stdint.h first to ensure one consistent