fix conflict variable name for russian GOST

common/common.cpp

@@ -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)
 #if defined(KICAD_GOST)
-    m_LeftMargin   = LEFTMARGIN;
-    m_RightMargin  = RIGHTMARGIN;
-    m_TopMargin    = TOPMARGIN;
-    m_BottomMargin = BOTTOMMARGIN;
+    m_LeftMargin   = GOST_LEFTMARGIN;
+    m_RightMargin  = GOST_RIGHTMARGIN;
+    m_TopMargin    = GOST_TOPMARGIN;
+    m_BottomMargin = GOST_BOTTOMMARGIN;
 #else
     m_LeftMargin = m_RightMargin = m_TopMargin = m_BottomMargin = 400;
 #endif

include/common.h

@@ -84,10 +84,10 @@ enum UserUnitType {
 };
 
 #if defined(KICAD_GOST)
-#define LEFTMARGIN   800    /* 20mm */
-#define RIGHTMARGIN  200    /* 5mm */
-#define TOPMARGIN    200    /* 5mm */
-#define BOTTOMMARGIN 200    /* 5mm */
+#define GOST_LEFTMARGIN   800    /* 20mm */
+#define GOST_RIGHTMARGIN  200    /* 5mm */
+#define GOST_TOPMARGIN    200    /* 5mm */
+#define GOST_BOTTOMMARGIN 200    /* 5mm */
 
 #endif
 /* forward declarations: */