diff options
| author |  Paul Buxton <paulbuxton.mail@googlemail.com> | 2019-08-28 10:21:24 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-08-29 12:55:25 -0700 |
| commit | 3c4fd5d5999db218878563a98e9c76903d63d2bb (patch) | |
| tree | 9c3bf3bba466063e5ad599d43795254acce9d798 /core/units.h | |
| parent | 193c456f06c022c1d83d4f0238c46c541a726c3c (diff) | |
| download | subsurface-3c4fd5d5999db218878563a98e9c76903d63d2bb.tar.gz | |
Fix broken windows build with latest MXE
Replaces some enums with names that do not clash with windows #defines.
Specifically:
ERROR -> ERRORED, PASCAL->PASCALS, IGNORE->IGNORED,FLOAT->FLOATVAL
Signed-off-by: Paul Buxton <paulbuxton.mail@googlemail.com>
Diffstat (limited to 'core/units.h')
| -rw-r--r-- | core/units.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/units.h b/core/units.h index 565b15d58..da7bda0b2 100644 --- a/core/units.h +++ b/core/units.h @@ -271,9 +271,6 @@ static inline int32_t pressure_to_altitude(int32_t pressure) // pressure in mbar * keeps track of those units. */ /* turns out in Win32 PASCAL is defined as a calling convention */ -#ifdef WIN32 -#undef PASCAL -#endif struct units { enum LENGTH { METERS, @@ -286,7 +283,7 @@ struct units { enum PRESSURE { BAR, PSI, - PASCAL + PASCALS } pressure; enum TEMPERATURE { CELSIUS, |