When building with MSVC some of the header file stuff is only relevant in early versi...

diff --git a/msvc_extra_headers/ardourext/misc.h.input b/msvc_extra_headers/ardourext/misc.h.input
index 47cff5629571385e602affe07a5c33b94f381bca..a5f4e9e95cecbcfc9fd1d84fb75bab0b3363126f 100644 (file)
--- 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()
 #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()
 {
 #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
                return val;
 }
 #endif

+#endif

 
 // fmin() and fmax()
 #define fmin(a, b) min((double)a, (double)b)
 
 // 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 24d1b29ab38fae6a503e4594766a632a3f2b45e2..aa0970024112597de9455adf75d01fb832737d71 100644 (file)
--- 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
 
 #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 */
 #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
 #endif

+#endif

 
 /* 'stdint.h' conflicts with various other libraries so
    let's #include stdint.h first to ensure one consistent
 
 /* 'stdint.h' conflicts with various other libraries so
    let's #include stdint.h first to ensure one consistent