Rationalise #undef-ing of ERROR.

diff --git a/src/types.h b/src/types.h
index 98c269554e9a948fe7b88684ae35245b8758fda6..340d86133524cae4896ee853ebf135405d5e60be 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -51,7 +51,7 @@ LIBDCP_ENABLE_WARNINGS
 #include <string>
 
 
-/* MinGW seems to define this, but we want to use it */
+/* windows.h defines this but we want to use it */
 #undef ERROR
 
 

diff --git a/src/util.h b/src/util.h
index fe662dd4766512f7f827df6521ff3aeea2d8ef71..ccbe6083a057ba3c86dbe5ffb8bf859311128c5a 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -55,6 +55,10 @@ LIBDCP_ENABLE_WARNINGS
 #include <stdint.h>
 
 
+/* windows.h defines this but we want to use it */
+#undef ERROR
+
+
 #define LIBDCP_UNUSED(x) (void)(x)
 
 

diff --git a/src/verify.h b/src/verify.h
index 04c5d869d3a5c1bdbe2d406ffaab055f45408999..2d3cc9df66c1562b174e381ec9864f0b28aefd64 100644 (file)
--- a/src/verify.h
+++ b/src/verify.h
@@ -50,7 +50,7 @@
 #include <vector>
 
 
-/* Something in windows.h defines this */
+/* windows.h defines this but we want to use it */
 #undef ERROR