diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-05-16 08:35:39 +0200 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-05-16 08:35:39 +0200 |
commit | 0adc05286d97536637d01ed0a295d45f7bb60c1d (patch) | |
tree | 7f06e82a515d4ab47f5c944eaec98c2b43b8c146 /src/powerlist.cc | |
parent | c91ae2624f3d3c003c6b2065f3cc128b1b039801 (diff) | |
parent | ceda77eb38f0b0824f03348f5291e3a42d8f7306 (diff) |
Merge remote-tracking branch 'origin' into diskstreaming
Conflicts:
src/Makefile.am.drumgizmo
src/drumgizmo.h
Diffstat (limited to 'src/powerlist.cc')
-rw-r--r-- | src/powerlist.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/powerlist.cc b/src/powerlist.cc index 6fc77ad..4248b30 100644 --- a/src/powerlist.cc +++ b/src/powerlist.cc @@ -27,11 +27,17 @@ #include "powerlist.h" #include <stdlib.h> -#include <math.h> + #include <string.h> #include <hugin.hpp> +// M_PI is not defined in math.h if __STRICT_ANSI__ is defined. +#ifdef __STRICT_ANSI__ +#undef __STRICT_ANSI__ +#endif +#include <math.h> + /** * Minimum sample set size. * Smaller means wider 'velocity groups'. |