More win32 build fixes.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 4c824080c6727d0e36d162e3af3723ef91234009..edabb9e233b9c9595e704fb5a7831bd003193bc9 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -100,16 +100,24 @@ struct EqualityOptions {
                : max_mean_pixel_error (0)
                , max_std_dev_pixel_error (0)
                , max_audio_sample_error (0)
+               , cpl_names_can_differ (false)
+               , mxf_names_can_differ (false)
        {}
 
        double max_mean_pixel_error;
        double max_std_dev_pixel_error;
        int max_audio_sample_error;
+       bool cpl_names_can_differ;
+       bool mxf_names_can_differ;
 };
 
+/* Win32 defines this */       
+#undef ERROR
+
 enum NoteType {
        PROGRESS,
-       ERROR
+       ERROR,
+       NOTE
 };
 
 /** @class Color