Skip to content

Commit 6360d13

Browse files
committed
rename SIZE to LENGTH to avoid conflict with windows headers
1 parent 5e8e268 commit 6360d13

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/units.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace Sass {
5656
{
5757
switch (unit & 0xFF00)
5858
{
59-
case SassUnitType::SIZE: return SassUnitType::SIZE; break;
59+
case SassUnitType::LENGTH: return SassUnitType::LENGTH; break;
6060
case SassUnitType::ANGLE: return SassUnitType::ANGLE; break;
6161
case SassUnitType::TIME: return SassUnitType::TIME; break;
6262
case SassUnitType::FREQUENCY: return SassUnitType::FREQUENCY; break;
@@ -144,7 +144,7 @@ namespace Sass {
144144
// only process known units
145145
if (u1 != UNKNOWN && u2 != UNKNOWN) {
146146
switch (t1) {
147-
case SassUnitType::SIZE: return size_conversion_factors[i1][i2]; break;
147+
case SassUnitType::LENGTH: return size_conversion_factors[i1][i2]; break;
148148
case SassUnitType::ANGLE: return angle_conversion_factors[i1][i2]; break;
149149
case SassUnitType::TIME: return time_conversion_factors[i1][i2]; break;
150150
case SassUnitType::FREQUENCY: return frequency_conversion_factors[i1][i2]; break;

src/units.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Sass {
1010
const double PI = acos(-1);
1111

1212
enum SassUnitType {
13-
SIZE = 0x000,
13+
LENGTH = 0x000,
1414
ANGLE = 0x100,
1515
TIME = 0x200,
1616
FREQUENCY = 0x300,
@@ -21,7 +21,7 @@ namespace Sass {
2121
enum SassUnit {
2222

2323
// size units
24-
IN = SIZE,
24+
IN = SassUnitType::LENGTH,
2525
CM,
2626
PC,
2727
MM,

0 commit comments

Comments
 (0)