Index: globalconst.h
===================================================================
--- globalconst.h	(revision 31019)
+++ globalconst.h	(revision 31020)
@@ -40,23 +40,23 @@
 #define PCB_MAX_ARCRADIUS    RND_MAX_COORD
 #define PCB_MIN_TEXTSCALE    1 /* scaling of text objects in percent (must be an integer greater than 0) */
 #define PCB_MAX_TEXTSCALE    10000
-#define PCB_MIN_PINORVIASIZE PCB_MIL_TO_COORD(20)	/* size of a pin or via */
-#define PCB_MIN_PINORVIAHOLE PCB_MIL_TO_COORD(4)	/* size of a pins or vias drilling hole */
+#define PCB_MIN_PINORVIASIZE RND_MIL_TO_COORD(20)	/* size of a pin or via */
+#define PCB_MIN_PINORVIAHOLE RND_MIL_TO_COORD(4)	/* size of a pins or vias drilling hole */
 #define PCB_MAX_PINORVIASIZE ((rnd_coord_t)RND_LARGE_VALUE)
-#define PCB_MIN_PINORVIACOPPER PCB_MIL_TO_COORD(4)	/* min difference outer-inner diameter */
+#define PCB_MIN_PINORVIACOPPER RND_MIL_TO_COORD(4)	/* min difference outer-inner diameter */
 #define PCB_MIN_GRID         1
 #define PCB_MAX_FONTPOSITION 255 /* upper limit of characters in my font */
 
 #define PCB_MAX_BUFFER       5 /* number of pastebuffers additional changes in menu.c are also required to select more buffers */
 
-#define PCB_EMARK_SIZE                  PCB_MIL_TO_COORD(10) 	/* size of diamond element mark */
-#define PCB_SUBC_AUX_UNIT               PCB_MM_TO_COORD(1) /* size of the unit vector for the subc-aux layer */
+#define PCB_EMARK_SIZE                  RND_MIL_TO_COORD(10) 	/* size of diamond element mark */
+#define PCB_SUBC_AUX_UNIT               RND_MM_TO_COORD(1) /* size of the unit vector for the subc-aux layer */
 
 /**** Font ***/
 /* These are used in debug draw font rendering (e.g. pin names) and reverse
    scale calculations (e.g. when report is trying to figure how the font
    is scaled. Changing these values is not really supported. */
-#define  PCB_FONT_CAPHEIGHT    PCB_MIL_TO_COORD (45)   /* (Approximate) capheight size of the default PCB font */
+#define  PCB_FONT_CAPHEIGHT    RND_MIL_TO_COORD (45)   /* (Approximate) capheight size of the default PCB font */
 #define  PCB_DEFAULT_CELLSIZE  50                  /* default cell size for symbols */
 
 #endif