Mercurial > audlegacy
changeset 1728:ce4322fee858 trunk
[svn] Add #undef FSCALE, since it's already defined on OpenBSD
| author | js |
|---|---|
| date | Sat, 16 Sep 2006 19:21:06 -0700 |
| parents | 9b529320119d |
| children | 3ee4c6d45c27 |
| files | ChangeLog Plugins/Input/timidity/libtimidity/options.h |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Sep 16 19:18:59 2006 -0700 +++ b/ChangeLog Sat Sep 16 19:21:06 2006 -0700 @@ -1,3 +1,11 @@ +2006-09-17 02:18:59 +0000 Jonathan Schleifer <js@h3c.de> + revision [2391] + #undef TRUE and FALSE before inclusion of mpcdec.h since both, GTK and mpcdev, define this, which leads to a hard error on OpenBSD + + Changes: Modified: + +2 -0 trunk/Plugins/Input/musepack/libmpc.h + + 2006-09-17 02:13:26 +0000 Jonathan Schleifer <js@h3c.de> revision [2389] #undef ALIGN, since it's already defined on OpenBSD.
--- a/Plugins/Input/timidity/libtimidity/options.h Sat Sep 16 19:18:59 2006 -0700 +++ b/Plugins/Input/timidity/libtimidity/options.h Sat Sep 16 19:21:06 2006 -0700 @@ -88,6 +88,7 @@ #define MAX_AMP_VALUE ((1<<(AMP_BITS+1))-1) +#undef FSCALE #define FSCALE(a,b) (float)((a) * (double)(1<<(b))) #define FSCALENEG(a,b) (float)((a) * (1.0L / (double)(1<<(b))))