Work around symbol clash with ERROR on Win32/mingw.

[libdcp.git] / src / content.cc

diff --git a/src/content.cc b/src/content.cc
index 50db005aaa3a55a8b0e1da5ed76769a33f75ea45..007d5cbcad3f5f6ff0fa3621973eea47b0bab011 100644 (file)
--- a/src/content.cc
+++ b/src/content.cc
@@ -27,9 +27,6 @@
 #include <boost/function.hpp>
 #include <iostream>
 
-/* We need this here for the #undef ERROR for Windows */
-#include "types.h"
-
 using namespace std;
 using namespace boost;
 using namespace dcp;
@@ -57,12 +54,12 @@ Content::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::fu
        }
        
        if (_edit_rate != other->_edit_rate) {
-               note (ERROR, "content edit rates differ");
+               note (DCP_ERROR, "content edit rates differ");
                return false;
        }
        
        if (_intrinsic_duration != other->_intrinsic_duration) {
-               note (ERROR, "asset intrinsic durations differ");
+               note (DCP_ERROR, "asset intrinsic durations differ");
                return false;
        }