smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

When building with MSVC some of the header file stuff is only relevant in early versions (e.g. VC8)

Browse source
This commit is contained in:
John Emmas 2016-09-30 08:24:51 +01:00
parent 85072e16aa
commit 9df3a2a547
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
msvc_extra_headers/ardourext/misc.h.input
View file

@ -196,6 +196,7 @@ typedef _mode_t mode_t;
#endif /* _MODE_T_ */ #endif /* _MODE_T_ */
// int64 abs() // int64 abs()
#if (defined(_MSC_VER) && (_MSC_VER < 1500))
#ifdef __cplusplus // Normal 'C' doesn't permit over-ridden functions !! #ifdef __cplusplus // Normal 'C' doesn't permit over-ridden functions !!
inline int64_t abs(int64_t val) throw() inline int64_t abs(int64_t val) throw()
{ {
@ -205,6 +206,7 @@ inline int64_t abs(int64_t val) throw()
return val; return val;
} }
#endif #endif
#endif
// fmin() and fmax() // fmin() and fmax()
#define fmin(a, b) min((double)a, (double)b) #define fmin(a, b) min((double)a, (double)b)

2
msvc_extra_headers/ardourext/sys/targetsxs.h.input
View file

@ -34,6 +34,7 @@
#define RDC_BUILD 1 #define RDC_BUILD 1
#endif #endif
#if (defined (_MSC_VER) && (_MSC_VER == 1400))
#ifndef __midl #ifndef __midl
#if defined(_DEBUG) || defined (DEBUG) #if defined(_DEBUG) || defined (DEBUG)
/* Experimental - link to the lowest DebugCRT so we can run on another system */ /* 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 /* 'stdint.h' conflicts with various other libraries so
let's #include stdint.h first to ensure one consistent let's #include stdint.h first to ensure one consistent