haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict variable name for russian GOST

This commit is contained in:
Andrey Fedorushkov 2010-07-13 17:18:13 +04:00
parent dba4a692f1
commit 8071562225
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/common.cpp
View File

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

8
include/common.h
View File

@ -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: */