Index: trunk/src/librnd/core/hidlib_conf.c
===================================================================
--- trunk/src/librnd/core/hidlib_conf.c	(revision 31020)
+++ trunk/src/librnd/core/hidlib_conf.c	(revision 31021)
@@ -66,6 +66,6 @@
 
 void rnd_hidlib_set_unit(rnd_hidlib_t *hidlib, const rnd_unit_t *new_unit)
 {
-	if (new_unit != NULL && new_unit->allow != PCB_UNIT_NO_PRINT)
+	if (new_unit != NULL && new_unit->allow != RND_UNIT_NO_PRINT)
 		rnd_conf_set(RND_CFR_DESIGN, "editor/grid_unit", -1, new_unit->suffix, RND_POL_OVERWRITE);
 }
Index: trunk/src/librnd/core/rnd_printf.c
===================================================================
--- trunk/src/librnd/core/rnd_printf.c	(revision 31020)
+++ trunk/src/librnd/core/rnd_printf.c	(revision 31021)
@@ -162,7 +162,7 @@
 		value = value_local;
 
 	if (allow == 0)
-		allow = PCB_UNIT_ALLOW_ALL_SANE;
+		allow = RND_UNIT_ALLOW_ALL_SANE;
 
 	i = printf_spec_->used + 64;
 	if (i > sizeof(printf_spec_new_local))
@@ -171,9 +171,9 @@
 		printf_spec_new = printf_spec_new_local;
 
 	/* Check our freedom in choosing units */
-	if ((allow & PCB_UNIT_ALLOW_IMPERIAL) == 0)
+	if ((allow & RND_UNIT_ALLOW_IMPERIAL) == 0)
 		family = PCB_UNIT_METRIC;
-	else if ((allow & PCB_UNIT_ALLOW_METRIC) == 0)
+	else if ((allow & RND_UNIT_ALLOW_METRIC) == 0)
 		family = PCB_UNIT_IMPERIAL;
 	else {
 		int met_votes = 0, imp_votes = 0;
@@ -280,8 +280,8 @@
 
 /* Conversion preference table */
 static human_coord_t human_coord[] = {
-	{2, PCB_UNIT_ALLOW_MM,  0.001, PCB_UNIT_ALLOW_UM, 1000.0, PCB_UNIT_ALLOW_M     ,NULL,NULL,NULL},
-	{1, PCB_UNIT_ALLOW_MIL, 0,     0,        1000.0, PCB_UNIT_ALLOW_IN    ,NULL,NULL,NULL}
+	{2, RND_UNIT_ALLOW_MM,  0.001, RND_UNIT_ALLOW_UM, 1000.0, RND_UNIT_ALLOW_M     ,NULL,NULL,NULL},
+	{1, RND_UNIT_ALLOW_MIL, 0,     0,        1000.0, RND_UNIT_ALLOW_IN    ,NULL,NULL,NULL}
 };
 #define NUM_HUMAN_COORD (sizeof(human_coord) / sizeof(human_coord[0]))
 
@@ -427,7 +427,7 @@
 	char tmp[128]; /* large enough for rendering a long long int */
 	int tmplen, retval = -1, slot_recursion = 0, mq_has_spec;
 	char *dot, *free_fmt = NULL;
-	enum rnd_allow_e mask = PCB_UNIT_ALLOW_ALL_SANE;
+	enum rnd_allow_e mask = RND_UNIT_ALLOW_ALL_SANE;
 	unsigned long maxfmts;
 
 	if ((safe & PCB_SAFEPRINT_arg_max) > 0)
@@ -515,7 +515,7 @@
 
 			/* Get our sub-specifiers */
 			if (*fmt == '#') {
-				mask = PCB_UNIT_ALLOW_CMIL;			/* This must be pcb's base unit */
+				mask = RND_UNIT_ALLOW_CMIL;			/* This must be pcb's base unit */
 				fmt++;
 			}
 			if (*fmt == '$') {
@@ -623,13 +623,13 @@
 					if (QstringToString(string, qstr, '"', '\\', needsq) != 0) goto err;
 					break;
 				case 'I':
-					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_NM, PCB_UNIT_NO_SUFFIX) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, RND_UNIT_ALLOW_NM, PCB_UNIT_NO_SUFFIX) != 0) goto err;
 					break;
 				case 's':
-					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_MIL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, RND_UNIT_ALLOW_MM | RND_UNIT_ALLOW_MIL, suffix) != 0) goto err;
 					break;
 				case 'S':
-					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_NATURAL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, mask & RND_UNIT_ALLOW_NATURAL, suffix) != 0) goto err;
 					break;
 				case 'N':
 					if (CoordsToString(string, value, 1, &spec, mask, suffix) != 0) goto err;
@@ -640,16 +640,16 @@
 					if (CoordsToHumanString(string, value[0], &spec, suffix) != 0) goto err;
 					break;
 				case 'M':
-					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_METRIC, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, mask & RND_UNIT_ALLOW_METRIC, suffix) != 0) goto err;
 					break;
 				case 'L':
-					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_IMPERIAL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, mask & RND_UNIT_ALLOW_IMPERIAL, suffix) != 0) goto err;
 					break;
 				case 'k':
-					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_DMIL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, RND_UNIT_ALLOW_DMIL, suffix) != 0) goto err;
 					break;
 				case 'r':
-					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_READABLE, PCB_UNIT_NO_SUFFIX) != 0) goto err;
+					if (CoordsToString(string, value, 1, &spec, RND_UNIT_ALLOW_READABLE, PCB_UNIT_NO_SUFFIX) != 0) goto err;
 					break;
 					/* All these fallthroughs are deliberate */
 				case '9':
@@ -671,13 +671,13 @@
 					if (safe & PCB_SAFEPRINT_COORD_ONLY)
 						return -1;
 					value[count++] = va_arg(args, rnd_coord_t);
-					if (CoordsToString(string, value, count, &spec, mask & PCB_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
+					if (CoordsToString(string, value, count, &spec, mask & RND_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
 					break;
 				case 'd':
 					if (safe & PCB_SAFEPRINT_COORD_ONLY)
 						return -1;
 					value[1] = va_arg(args, rnd_coord_t);
-					if (CoordsToString(string, value, 2, &spec, PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_MIL, suffix) != 0) goto err;
+					if (CoordsToString(string, value, 2, &spec, RND_UNIT_ALLOW_MM | RND_UNIT_ALLOW_MIL, suffix) != 0) goto err;
 					break;
 				case '*':
 					{
@@ -690,7 +690,7 @@
 							}
 						}
 						if (!found)
-							if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
+							if (CoordsToString(string, value, 1, &spec, mask & RND_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
 					}
 					break;
 				case 'a':
@@ -735,7 +735,7 @@
 							}
 						}
 						if (!found)
-							if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
+							if (CoordsToString(string, value, 1, &spec, RND_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
 					}
 					break;
 				}
Index: trunk/src/librnd/core/unit.c
===================================================================
--- trunk/src/librnd/core/unit.c	(revision 31020)
+++ trunk/src/librnd/core/unit.c	(revision 31021)
@@ -41,27 +41,27 @@
 /* Should be kept in order of smallest scale_factor to largest -- the code
    uses this ordering for finding the best scale to use for a group of units */
 rnd_unit_t rnd_units[] = {
-	{"km",   'k', 0.000001, PCB_UNIT_METRIC,   PCB_UNIT_ALLOW_KM, 5},
-	{"m",    'f', 0.001,    PCB_UNIT_METRIC,   PCB_UNIT_ALLOW_M, 5},
-	{"cm",   'e', 0.1,      PCB_UNIT_METRIC,   PCB_UNIT_ALLOW_CM, 5},
-	{"mm",   'm', 1,        PCB_UNIT_METRIC,   PCB_UNIT_ALLOW_MM, 4},
-	{"um",   'u', 1000,     PCB_UNIT_METRIC,   PCB_UNIT_ALLOW_UM, 2},
-	{"du",   'd', 10000,    PCB_UNIT_METRIC,   PCB_UNIT_ALLOW_DU, 2},  /* eagle bin decimicron */
-	{"nm",   'n', 1000000,  PCB_UNIT_METRIC,   PCB_UNIT_ALLOW_NM, 0},
+	{"km",   'k', 0.000001, PCB_UNIT_METRIC,   RND_UNIT_ALLOW_KM, 5},
+	{"m",    'f', 0.001,    PCB_UNIT_METRIC,   RND_UNIT_ALLOW_M, 5},
+	{"cm",   'e', 0.1,      PCB_UNIT_METRIC,   RND_UNIT_ALLOW_CM, 5},
+	{"mm",   'm', 1,        PCB_UNIT_METRIC,   RND_UNIT_ALLOW_MM, 4},
+	{"um",   'u', 1000,     PCB_UNIT_METRIC,   RND_UNIT_ALLOW_UM, 2},
+	{"du",   'd', 10000,    PCB_UNIT_METRIC,   RND_UNIT_ALLOW_DU, 2},  /* eagle bin decimicron */
+	{"nm",   'n', 1000000,  PCB_UNIT_METRIC,   RND_UNIT_ALLOW_NM, 0},
 
-	{"in",   'i', 0.001,    PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_IN, 5},
-	{"mil",  'l', 1,        PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_MIL, 2},
-	{"dmil", 'k', 10,       PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_DMIL, 1},/* kicad legacy decimil unit */
-	{"cmil", 'c', 100,      PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_CMIL, 0},
+	{"in",   'i', 0.001,    PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_IN, 5},
+	{"mil",  'l', 1,        PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_MIL, 2},
+	{"dmil", 'k', 10,       PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_DMIL, 1},/* kicad legacy decimil unit */
+	{"cmil", 'c', 100,      PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_CMIL, 0},
 
-	{"Hz",   'z', 1,           PCB_UNIT_FREQ,  PCB_UNIT_ALLOW_HZ, 3},
-	{"kHz",  'Z', 0.001,       PCB_UNIT_FREQ,  PCB_UNIT_ALLOW_KHZ, 6},
-	{"MHz",  'M', 0.000001,    PCB_UNIT_FREQ,  PCB_UNIT_ALLOW_MHZ, 6},
-	{"GHz",  'G', 0.000000001, PCB_UNIT_FREQ,  PCB_UNIT_ALLOW_GHZ, 6},
+	{"Hz",   'z', 1,           PCB_UNIT_FREQ,  RND_UNIT_ALLOW_HZ, 3},
+	{"kHz",  'Z', 0.001,       PCB_UNIT_FREQ,  RND_UNIT_ALLOW_KHZ, 6},
+	{"MHz",  'M', 0.000001,    PCB_UNIT_FREQ,  RND_UNIT_ALLOW_MHZ, 6},
+	{"GHz",  'G', 0.000000001, PCB_UNIT_FREQ,  RND_UNIT_ALLOW_GHZ, 6},
 
 	/* aliases - must be a block at the end */
-	{"inch",  0,  0.001,    PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_IN, 5},
-	{"pcb",   0,  100,      PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_CMIL, 0} /* old io_pcb unit */
+	{"inch",  0,  0.001,    PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_IN, 5},
+	{"pcb",   0,  100,      PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_CMIL, 0} /* old io_pcb unit */
 };
 
 #define N_UNITS ((int) (sizeof rnd_units / sizeof rnd_units[0]))
Index: trunk/src/librnd/core/unit.h
===================================================================
--- trunk/src/librnd/core/unit.h	(revision 31020)
+++ trunk/src/librnd/core/unit.h	(revision 31021)
@@ -38,40 +38,40 @@
 #include <librnd/core/global_typedefs.h>
 
 enum rnd_allow_e {
-	PCB_UNIT_NO_PRINT = 0, /* suffixes we can read but not print (i.e., "inch") */
-	PCB_UNIT_ALLOW_NM = 1,
-	PCB_UNIT_ALLOW_UM = 2,
-	PCB_UNIT_ALLOW_MM = 4,
-	PCB_UNIT_ALLOW_CM = 8,
-	PCB_UNIT_ALLOW_M = 16,
-	PCB_UNIT_ALLOW_KM = 32,
-	PCB_UNIT_ALLOW_DU = 64, /* "du" = 0.1 micron "decimicron" units, for eagle bin */
+	RND_UNIT_NO_PRINT = 0, /* suffixes we can read but not print (i.e., "inch") */
+	RND_UNIT_ALLOW_NM = 1,
+	RND_UNIT_ALLOW_UM = 2,
+	RND_UNIT_ALLOW_MM = 4,
+	RND_UNIT_ALLOW_CM = 8,
+	RND_UNIT_ALLOW_M = 16,
+	RND_UNIT_ALLOW_KM = 32,
+	RND_UNIT_ALLOW_DU = 64, /* "du" = 0.1 micron "decimicron" units, for eagle bin */
 
-	PCB_UNIT_ALLOW_CMIL = 1024,
-	PCB_UNIT_ALLOW_MIL = 2048,
-	PCB_UNIT_ALLOW_IN = 4096,
+	RND_UNIT_ALLOW_CMIL = 1024,
+	RND_UNIT_ALLOW_MIL = 2048,
+	RND_UNIT_ALLOW_IN = 4096,
 
-	PCB_UNIT_ALLOW_DMIL = 8192, /* for kicad legacy decimil units */
+	RND_UNIT_ALLOW_DMIL = 8192, /* for kicad legacy decimil units */
 
-	PCB_UNIT_ALLOW_HZ = 16384,
-	PCB_UNIT_ALLOW_KHZ = 32768,
-	PCB_UNIT_ALLOW_MHZ = 65536,
-	PCB_UNIT_ALLOW_GHZ = 131072,
+	RND_UNIT_ALLOW_HZ = 16384,
+	RND_UNIT_ALLOW_KHZ = 32768,
+	RND_UNIT_ALLOW_MHZ = 65536,
+	RND_UNIT_ALLOW_GHZ = 131072,
 
-	PCB_UNIT_ALLOW_METRIC = PCB_UNIT_ALLOW_NM  | PCB_UNIT_ALLOW_UM | PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_CM | PCB_UNIT_ALLOW_M | PCB_UNIT_ALLOW_KM,
-	PCB_UNIT_ALLOW_IMPERIAL = PCB_UNIT_ALLOW_DMIL | PCB_UNIT_ALLOW_CMIL | PCB_UNIT_ALLOW_MIL | PCB_UNIT_ALLOW_IN,
-	PCB_UNIT_ALLOW_FREQ = PCB_UNIT_ALLOW_HZ | PCB_UNIT_ALLOW_KHZ | PCB_UNIT_ALLOW_MHZ | PCB_UNIT_ALLOW_GHZ,
+	RND_UNIT_ALLOW_METRIC = RND_UNIT_ALLOW_NM  | RND_UNIT_ALLOW_UM | RND_UNIT_ALLOW_MM | RND_UNIT_ALLOW_CM | RND_UNIT_ALLOW_M | RND_UNIT_ALLOW_KM,
+	RND_UNIT_ALLOW_IMPERIAL = RND_UNIT_ALLOW_DMIL | RND_UNIT_ALLOW_CMIL | RND_UNIT_ALLOW_MIL | RND_UNIT_ALLOW_IN,
+	RND_UNIT_ALLOW_FREQ = RND_UNIT_ALLOW_HZ | RND_UNIT_ALLOW_KHZ | RND_UNIT_ALLOW_MHZ | RND_UNIT_ALLOW_GHZ,
 
 	/* DO NOT USE - this is all units allowed in %mr and io_pcb old format */
-	PCB_UNIT_ALLOW_READABLE = PCB_UNIT_ALLOW_CMIL,
+	RND_UNIT_ALLOW_READABLE = RND_UNIT_ALLOW_CMIL,
 
 	/* Used for pcb-printf %mS - should not include unusual units like km, cmil and dmil */
-	PCB_UNIT_ALLOW_NATURAL = PCB_UNIT_ALLOW_NM | PCB_UNIT_ALLOW_UM | PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_M | PCB_UNIT_ALLOW_MIL | PCB_UNIT_ALLOW_IN,
+	RND_UNIT_ALLOW_NATURAL = RND_UNIT_ALLOW_NM | RND_UNIT_ALLOW_UM | RND_UNIT_ALLOW_MM | RND_UNIT_ALLOW_M | RND_UNIT_ALLOW_MIL | RND_UNIT_ALLOW_IN,
 
 	/* Allow all but the most exotic */
-	PCB_UNIT_ALLOW_ALL_SANE = ~(PCB_UNIT_ALLOW_DU | PCB_UNIT_ALLOW_DMIL),
+	RND_UNIT_ALLOW_ALL_SANE = ~(RND_UNIT_ALLOW_DU | RND_UNIT_ALLOW_DMIL),
 
-	PCB_UNIT_ALLOW_ALL = ~0
+	RND_UNIT_ALLOW_ALL = ~0
 };
 
 /* bitfield */
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 31020)
+++ trunk/src/librnd/pcb_compat.h	(revision 31021)
@@ -1160,3 +1160,26 @@
 #define PCB_SWAP_ANGLE RND_SWAP_ANGLE
 #define PCB_SWAP_DELTA RND_SWAP_DELTA
 #define pcb_coord_abs rnd_coord_abs
+#define PCB_UNIT_NO_PRINT RND_UNIT_NO_PRINT
+#define PCB_UNIT_ALLOW_NM RND_UNIT_ALLOW_NM
+#define PCB_UNIT_ALLOW_UM RND_UNIT_ALLOW_UM
+#define PCB_UNIT_ALLOW_MM RND_UNIT_ALLOW_MM
+#define PCB_UNIT_ALLOW_CM RND_UNIT_ALLOW_CM
+#define PCB_UNIT_ALLOW_M RND_UNIT_ALLOW_M
+#define PCB_UNIT_ALLOW_KM RND_UNIT_ALLOW_KM
+#define PCB_UNIT_ALLOW_DU RND_UNIT_ALLOW_DU
+#define PCB_UNIT_ALLOW_CMIL RND_UNIT_ALLOW_CMIL
+#define PCB_UNIT_ALLOW_MIL RND_UNIT_ALLOW_MIL
+#define PCB_UNIT_ALLOW_IN RND_UNIT_ALLOW_IN
+#define PCB_UNIT_ALLOW_DMIL RND_UNIT_ALLOW_DMIL
+#define PCB_UNIT_ALLOW_HZ RND_UNIT_ALLOW_HZ
+#define PCB_UNIT_ALLOW_KHZ RND_UNIT_ALLOW_KHZ
+#define PCB_UNIT_ALLOW_MHZ RND_UNIT_ALLOW_MHZ
+#define PCB_UNIT_ALLOW_GHZ RND_UNIT_ALLOW_GHZ
+#define PCB_UNIT_ALLOW_METRIC RND_UNIT_ALLOW_METRIC
+#define PCB_UNIT_ALLOW_IMPERIAL RND_UNIT_ALLOW_IMPERIAL
+#define PCB_UNIT_ALLOW_FREQ RND_UNIT_ALLOW_FREQ
+#define PCB_UNIT_ALLOW_READABLE RND_UNIT_ALLOW_READABLE
+#define PCB_UNIT_ALLOW_NATURAL RND_UNIT_ALLOW_NATURAL
+#define PCB_UNIT_ALLOW_ALL_SANE RND_UNIT_ALLOW_ALL_SANE
+#define PCB_UNIT_ALLOW_ALL RND_UNIT_ALLOW_ALL
Index: trunk/src_plugins/query/query_l.c
===================================================================
--- trunk/src_plugins/query/query_l.c	(revision 31020)
+++ trunk/src_plugins/query/query_l.c	(revision 31021)
@@ -1438,37 +1438,37 @@
 case 52:
 YY_RULE_SETUP
 #line 102 "query_l.l"
-{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; }
+{ qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_MM); return T_UNIT; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 103 "query_l.l"
-{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; }
+{ qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_M); return T_UNIT; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 104 "query_l.l"
-{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; }
+{ qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_UM); return T_UNIT; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 105 "query_l.l"
-{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; }
+{ qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_CM); return T_UNIT; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 106 "query_l.l"
-{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; }
+{ qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_NM); return T_UNIT; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 107 "query_l.l"
-{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; }
+{ qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_MIL); return T_UNIT; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 108 "query_l.l"
-{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; }
+{ qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_IN); return T_UNIT; }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
Index: trunk/src_plugins/query/query_l.l
===================================================================
--- trunk/src_plugins/query/query_l.l	(revision 31020)
+++ trunk/src_plugins/query/query_l.l	(revision 31021)
@@ -99,13 +99,13 @@
 "$dwg_area_x"   { qry_lval.c = PCB->hidlib.size_x; return T_INT; }
 "$dwg_area_y"   { qry_lval.c = PCB->hidlib.size_y; return T_INT; }
 
-mm              { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; }
-m               { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; }
-um              { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; }
-cm              { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; }
-nm              { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; }
-mil             { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; }
-inch            { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; }
+mm              { qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_MM); return T_UNIT; }
+m               { qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_M); return T_UNIT; }
+um              { qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_UM); return T_UNIT; }
+cm              { qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_CM); return T_UNIT; }
+nm              { qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_NM); return T_UNIT; }
+mil             { qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_MIL); return T_UNIT; }
+inch            { qry_lval.u = rnd_get_unit_struct_by_allow(RND_UNIT_ALLOW_IN); return T_UNIT; }
 
 thus            { return T_THUS; }
 [|][|]          { return T_OR; }
Index: trunk/tests/pcb-printf/tester.c
===================================================================
--- trunk/tests/pcb-printf/tester.c	(revision 31020)
+++ trunk/tests/pcb-printf/tester.c	(revision 31021)
@@ -49,10 +49,10 @@
 			PCB_PRINTF("ma=%ma\n", 130.1234);
 			PCB_PRINTF("ma=%ma\n", 555.1234);
 
-			PCB_PRINTF("m+=%m+%mS mil\n", PCB_UNIT_ALLOW_MIL, c[n]);
-			PCB_PRINTF("m+=%m+%mS mm\n", PCB_UNIT_ALLOW_MM, c[n]);
-			PCB_PRINTF("m+=%m+%mS m\n", PCB_UNIT_ALLOW_M, c[n]);
-			PCB_PRINTF("m+=%m+%mS mm or m\n", PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_M, c[n]);
+			PCB_PRINTF("m+=%m+%mS mil\n", RND_UNIT_ALLOW_MIL, c[n]);
+			PCB_PRINTF("m+=%m+%mS mm\n", RND_UNIT_ALLOW_MM, c[n]);
+			PCB_PRINTF("m+=%m+%mS m\n", RND_UNIT_ALLOW_M, c[n]);
+			PCB_PRINTF("m+=%m+%mS mm or m\n", RND_UNIT_ALLOW_MM | RND_UNIT_ALLOW_M, c[n]);
 		}
 #ifndef SPEED
 			printf("---------------\n");