Browse Source

Fix a compil warning on MSYS2 (POINTS collide with a Windows header define)

POINTS is renamed LY_POINT. no actual code change
master
jean-pierre charras 1 month ago
parent
commit
168975b0a8
  1. 4
      common/settings/layer_settings_utils.cpp
  2. 2
      include/settings/layer_settings_utils.h

4
common/settings/layer_settings_utils.cpp

@ -72,7 +72,7 @@ GAL_LAYER_ID RenderLayerFromVisibilityLayer( VISIBILITY_LAYER aLayer )
case VISIBILITY_LAYER::FOOTPRINT_REFERENCES: return LAYER_FP_REFERENCES;
case VISIBILITY_LAYER::FOOTPRINT_TEXT: return LAYER_FP_TEXT;
case VISIBILITY_LAYER::FOOTPRINT_ANCHORS: return LAYER_ANCHOR;
case VISIBILITY_LAYER::POINTS: return LAYER_POINTS;
case VISIBILITY_LAYER::LY_POINTS: return LAYER_POINTS;
case VISIBILITY_LAYER::RATSNEST: return LAYER_RATSNEST;
case VISIBILITY_LAYER::DRC_WARNINGS: return LAYER_DRC_WARNING;
case VISIBILITY_LAYER::DRC_ERRORS: return LAYER_DRC_ERROR;
@ -104,7 +104,7 @@ std::optional<VISIBILITY_LAYER> VisibilityLayerFromRenderLayer( GAL_LAYER_ID aLa
case LAYER_FP_REFERENCES: return VISIBILITY_LAYER::FOOTPRINT_REFERENCES;
case LAYER_FP_TEXT: return VISIBILITY_LAYER::FOOTPRINT_TEXT;
case LAYER_ANCHOR: return VISIBILITY_LAYER::FOOTPRINT_ANCHORS;
case LAYER_POINTS: return VISIBILITY_LAYER::POINTS;
case LAYER_POINTS: return VISIBILITY_LAYER::LY_POINTS;
case LAYER_RATSNEST: return VISIBILITY_LAYER::RATSNEST;
case LAYER_DRC_WARNING: return VISIBILITY_LAYER::DRC_WARNINGS;
case LAYER_DRC_ERROR: return VISIBILITY_LAYER::DRC_ERRORS;

2
include/settings/layer_settings_utils.h

@ -43,7 +43,7 @@ enum class VISIBILITY_LAYER
FOOTPRINT_REFERENCES,
FOOTPRINT_TEXT,
FOOTPRINT_ANCHORS,
POINTS,
LY_POINTS, // Do not use POINTS: it collide with a Windows header define
RATSNEST,
DRC_WARNINGS,
DRC_ERRORS,

Loading…
Cancel
Save