Work around symbol clash with ERROR on Win32/mingw.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index ece7d44c284bb547ee18764103947b887c7d8aa0..5ef04bd39caabd45bec65bd1267454b5906e51fc 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -137,13 +137,13 @@ struct EqualityOptions
        bool mxf_names_can_differ;
 };
 
-/* Win32 defines this */       
-#undef ERROR
-
+/* I've been unable to make mingw happy with ERROR as a symbol, so
+   I'm using a DCP_ prefix here.
+*/
 enum NoteType {
-       PROGRESS,
-       ERROR,
-       NOTE
+       DCP_PROGRESS,
+       DCP_ERROR,
+       DCP_NOTE
 };
 
 enum Standard {