Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 08:33:36 +02:00
Code Issues Releases Wiki Activity

VS2013 includes the log2() function, so prevent Nyquist from defining it.

Browse Source
This commit is contained in:
Leland Lucius
2015-04-08 11:29:55 -05:00
parent 5b4b3e3c53
commit ae7a7e67fb
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-src/libnyquist/nyquist/nyqsrc/sound.c
View File

@@ -1588,6 +1588,7 @@ double step_to_hz(double steps)
}
#ifdef WIN32
#ifndef _MSC_VER < 1800
#define RECIP_LOG_2 1.44269504088895364453
double log2(double x)
@@ -1595,6 +1596,7 @@ double log2(double x)
return log(x) * RECIP_LOG_2;
}
#endif
#endif
/*
* from old stuff...

20
lib-src/libnyquist/sound.patch Normal file
View File

@@ -0,0 +1,20 @@
diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sound.c b/lib-src/libnyquist/nyquist/nyqsrc/sound.c
index 35de780..d81beb5 100644
--- a/lib-src/libnyquist/nyquist/nyqsrc/sound.c
+++ b/lib-src/libnyquist/nyquist/nyqsrc/sound.c
@@ -1588,6 +1588,7 @@ double step_to_hz(double steps)
}
#ifdef WIN32
+#ifndef _MSC_VER < 1800
#define RECIP_LOG_2 1.44269504088895364453
double log2(double x)
@@ -1595,6 +1596,7 @@ double log2(double x)
return log(x) * RECIP_LOG_2;
}
#endif
+#endif
/*
* from old stuff...