realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows build, IN conflicts with windows header

Browse Source
This commit is contained in:
Mark Roszko 2025-09-04 19:52:34 -04:00
parent 9ffb0c8b96
commit 0ce952e705
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/text_eval/text_eval_wrapper.cpp
View File

@ -392,7 +392,7 @@ namespace KIEVAL_UNIT_CONV {
{ {
case text_eval_units::Unit::MM: return Unit::MM; case text_eval_units::Unit::MM: return Unit::MM;
case text_eval_units::Unit::CM: return Unit::CM; case text_eval_units::Unit::CM: return Unit::CM;
case text_eval_units::Unit::IN: return Unit::Inch; case text_eval_units::Unit::INCH: return Unit::Inch;
case text_eval_units::Unit::INCH_QUOTE: return Unit::Inch; case text_eval_units::Unit::INCH_QUOTE: return Unit::Inch;
case text_eval_units::Unit::MIL: return Unit::Mil; case text_eval_units::Unit::MIL: return Unit::Mil;
case text_eval_units::Unit::THOU: return Unit::Mil; case text_eval_units::Unit::THOU: return Unit::Mil;

6
include/text_eval/text_eval_units.h
View File

@ -50,7 +50,7 @@ enum class Unit {
// Common single and double character units // Common single and double character units
MM, // "mm" - millimeters MM, // "mm" - millimeters
CM, // "cm" - centimeters CM, // "cm" - centimeters
IN, // "in" - inches INCH, // "in" - inches
MIL, // "mil" - mils (thousandths of an inch) MIL, // "mil" - mils (thousandths of an inch)
UM, // "um" - micrometers UM, // "um" - micrometers
PS, // "ps" - picoseconds PS, // "ps" - picoseconds
@ -98,7 +98,7 @@ private:
// Common units // Common units
{Unit::MM, "mm", "Millimeters", 1.0}, {Unit::MM, "mm", "Millimeters", 1.0},
{Unit::CM, "cm", "Centimeters", 10.0}, {Unit::CM, "cm", "Centimeters", 10.0},
{Unit::IN, "in", "Inches", 25.4}, {Unit::INCH, "in", "Inches", 25.4},
{Unit::MIL, "mil", "Mils (thousandths of an inch)", 25.4 / 1000.0}, {Unit::MIL, "mil", "Mils (thousandths of an inch)", 25.4 / 1000.0},
{Unit::UM, "um", "Micrometers", 1.0 / 1000.0}, {Unit::UM, "um", "Micrometers", 1.0 / 1000.0},
{Unit::PS, "ps", "Picoseconds", 1.0}, {Unit::PS, "ps", "Picoseconds", 1.0},
@ -200,7 +200,7 @@ public:
case EDA_UNITS::MM: return Unit::MM; case EDA_UNITS::MM: return Unit::MM;
case EDA_UNITS::CM: return Unit::CM; case EDA_UNITS::CM: return Unit::CM;
case EDA_UNITS::MILS: return Unit::MIL; case EDA_UNITS::MILS: return Unit::MIL;
case EDA_UNITS::INCH: return Unit::IN; case EDA_UNITS::INCH: return Unit::INCH;
case EDA_UNITS::DEGREES: return Unit::DEG; case EDA_UNITS::DEGREES: return Unit::DEG;
case EDA_UNITS::FS: return Unit::FS; case EDA_UNITS::FS: return Unit::FS;
case EDA_UNITS::PS: return Unit::PS; case EDA_UNITS::PS: return Unit::PS;