diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-07-25 22:00:47 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-07-26 23:02:51 +0200 |
| commit | 9f7980e15f14c0d5f6b59e53b9bf939e62df20c9 (patch) | |
| tree | 7c0a1a221dd3b3c1c5b600dde99bf81eaaab93f0 | |
| parent | d4270052ecfd3f75314fc8ea0e22c20384ff8b3c (diff) | |
Rationalise #undef-ing of ERROR.tidy-eq-options
| -rw-r--r-- | src/types.h | 2 | ||||
| -rw-r--r-- | src/util.h | 4 | ||||
| -rw-r--r-- | 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 @@ -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 |