mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix broken windows build with latest MXE

Browse source 
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>
This commit is contained in:
Paul Buxton 2019-08-28 10:21:24 +01:00 • committed by Dirk Hohndel
parent 193c456f06
commit 3c4fd5d599
9 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/units.h
View file

@ -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,