From 0619a2de893636c19d0e654532303893e96ab1a4 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 19 Apr 2013 08:05:58 +0100
Subject: Try to fix.

---
 src/types.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/types.h b/src/types.h
index 3fcbd58f..b1de4a0f 100644
--- a/src/types.h
+++ b/src/types.h
@@ -109,6 +109,9 @@ struct EqualityOptions {
 	bool mxf_names_can_differ;
 };
 
+/* Win32 defines this */	
+#undef ERROR
+
 enum NoteType {
 	PROGRESS,
 	ERROR,
-- 
cgit v1.2.3