mirror of
https://github.com/cookiengineer/audacity
synced 2025-11-24 06:10:09 +01:00
Additional changes required to get build working under VS2013.
I'll send the changes to libscorealign and portsmf upstream.
This commit is contained in:
@@ -21,6 +21,16 @@
|
||||
#endif
|
||||
using namespace std;
|
||||
|
||||
#ifdef min
|
||||
#undef min
|
||||
#endif
|
||||
#define min(x,y) ((x)<(y)?(x):(y))
|
||||
|
||||
#ifdef max
|
||||
#undef max
|
||||
#endif
|
||||
#define max(x,y) ((x)>(y)?(x):(y))
|
||||
|
||||
//if 1, causes printing internally
|
||||
#define PRINT_BIN_ENERGY 1
|
||||
|
||||
|
||||
@@ -27,6 +27,11 @@ using namespace std;
|
||||
#define MAX(x, y) ((x) > (y) ? (x) : (y))
|
||||
#define ROUND(x) ((int) ((x) + 0.5))
|
||||
|
||||
#ifdef max
|
||||
#undef max
|
||||
#endif
|
||||
#define max(x,y) ((x)>(y)?(x):(y))
|
||||
|
||||
// 4311 is type cast ponter to long warning
|
||||
// 4996 is warning against strcpy
|
||||
// 4267 is size_t to long warning
|
||||
|
||||
Reference in New Issue
Block a user