From 9f7980e15f14c0d5f6b59e53b9bf939e62df20c9 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 25 Jul 2023 22:00:47 +0200
Subject: [PATCH] Rationalise #undef-ing of ERROR.

---
 src/types.h  | 2 +-
 src/util.h   | 4 ++++
 src/verify.h | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/types.h b/src/types.h
index 98c26955..340d8613 100644
--- 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 fe662dd4..ccbe6083 100644
--- 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 04c5d869..2d3cc9df 100644
--- 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
 
 
-- 
2.30.2