From 7bca4c05ca38b218c252b0fe98a866806d9a2ded Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 13 Jun 2014 12:51:48 +0100
Subject: Work around symbol clash with ERROR on Win32/mingw.

---
 src/content.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/content.cc')

diff --git a/src/content.cc b/src/content.cc
index 50db005a..007d5cbc 100644
--- 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;
 	}
 
-- 
cgit v1.2.3