Merge branch 'master' into cairocanvas

[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..9f9fd07543abcc7045ed69ecea3c674651391219 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 {
 
 
@@ -34,7 +38,7 @@ namespace ARDOUR {
  * Operators are defined so this may safely be used as if it were a simple
  * (single-typed) integer count of channels.
  */
-class ChanCount {
+class LIBARDOUR_API ChanCount {
 public:
        ChanCount(const XMLNode& node);
        ChanCount() { reset(); }