# HG changeset patch # User js # Date 1158459666 25200 # Node ID ce4322fee8582313dbd54fe8d39bb5a1ebf6d085 # Parent 9b529320119db80c5caf5c5f1a8290b77befc904 [svn] Add #undef FSCALE, since it's already defined on OpenBSD diff -r 9b529320119d -r ce4322fee858 ChangeLog --- 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 + 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 revision [2389] #undef ALIGN, since it's already defined on OpenBSD. diff -r 9b529320119d -r ce4322fee858 Plugins/Input/timidity/libtimidity/options.h --- 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))))