diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-27 09:04:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-27 09:04:44 +0200 |
| commit | f2d556ca02827d0d77d06388bfe1a40739f4d1f8 (patch) | |
| tree | 4c0ab405b27e11c65c9856651a1de048492cda45 /include/tools | |
| parent | 3dc9f684b3994bd125b9f27049581aa35b1e52bc (diff) | |
work around Windows and OSX macro collisions with enum values
Change-Id: I3d14b96b6b51e497bde33f0177b377e7fe3dbad9
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/wintypes.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index 6abb4b6d8dc4..e04248316396 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -299,13 +299,13 @@ enum class StandardButtonType { OK = 0, CANCEL = 1, - YES = 2, + SB_YES = 2, // overlaps with YES constant on MacOS NO = 3, RETRY = 4, HELP = 5, CLOSE = 6, MORE = 7, - IGNORE = 8, + SB_IGNORE = 8, // overlaps with IGNORE constant on Windows ABORT = 9, LESS = 10, RESET = 11, |