Merge branch 'master' into windows

[ardour.git] / libs / ardour / ardour / chan_count.h

diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h
index c4f3caef6b3fbeb256ebc79dd3211bbda28b4617..03e2fcd8fff58b27685f81710dd188381be959a4 100644 (file)
--- a/libs/ardour/ardour/chan_count.h
+++ b/libs/ardour/ardour/chan_count.h
@@ -26,6 +26,10 @@
 #include "pbd/xml++.h"
 #include "ardour/data_type.h"
 
+#ifdef INFINITE
+#undef INFINITE
+#endif
+
 namespace ARDOUR {