Skip to content

K
kicad-source-mirror
Commit 80715622 authored by Andrey Fedorushkov's avatar Andrey Fedorushkov
Browse files
Options

fix conflict variable name for russian GOST

parent dba4a692
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
common/common.cpp
View file @ 80715622
...@@ -211,10 +211,10 @@ Ki_PageDescr::Ki_PageDescr( const wxSize& size, ...@@ -211,10 +211,10 @@ Ki_PageDescr::Ki_PageDescr( const wxSize& size,
// Adjust the default value for margins to 400 mils (0,4 inch or 10 mm) // Adjust the default value for margins to 400 mils (0,4 inch or 10 mm)
#if defined(KICAD_GOST) #if defined(KICAD_GOST)
m_LeftMargin = LEFTMARGIN; m_LeftMargin = GOST_LEFTMARGIN;
m_RightMargin = RIGHTMARGIN; m_RightMargin = GOST_RIGHTMARGIN;
m_TopMargin = TOPMARGIN; m_TopMargin = GOST_TOPMARGIN;
m_BottomMargin = BOTTOMMARGIN; m_BottomMargin = GOST_BOTTOMMARGIN;
#else #else
m_LeftMargin = m_RightMargin = m_TopMargin = m_BottomMargin = 400; m_LeftMargin = m_RightMargin = m_TopMargin = m_BottomMargin = 400;
#endif #endif
......
include/common.h
View file @ 80715622
...@@ -84,10 +84,10 @@ enum UserUnitType { ...@@ -84,10 +84,10 @@ enum UserUnitType {
}; };
#if defined(KICAD_GOST) #if defined(KICAD_GOST)
#define LEFTMARGIN 800 /* 20mm */ #define GOST_LEFTMARGIN 800 /* 20mm */
#define RIGHTMARGIN 200 /* 5mm */ #define GOST_RIGHTMARGIN 200 /* 5mm */
#define TOPMARGIN 200 /* 5mm */ #define GOST_TOPMARGIN 200 /* 5mm */
#define BOTTOMMARGIN 200 /* 5mm */ #define GOST_BOTTOMMARGIN 200 /* 5mm */
#endif #endif
/* forward declarations: */ /* forward declarations: */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment