Index: trunk/src/box.h
===================================================================
--- trunk/src/box.h	(revision 23091)
+++ trunk/src/box.h	(revision 23092)
@@ -107,8 +107,8 @@
 
 #define	PCB_BOX_MOVE_LOWLEVEL(b,dx,dy)		\
 	{									\
-		PCB_MOVE((b)->X1,(b)->Y1,(dx),(dy))	\
-		PCB_MOVE((b)->X2,(b)->Y2,(dx),(dy))	\
+		PCB_MOVE_POINT((b)->X1,(b)->Y1,(dx),(dy))	\
+		PCB_MOVE_POINT((b)->X2,(b)->Y2,(dx),(dy))	\
 	}
 
 
Index: trunk/src/move.h
===================================================================
--- trunk/src/move.h	(revision 23091)
+++ trunk/src/move.h	(revision 23092)
@@ -32,7 +32,7 @@
 #include "config.h"
 
 /*** Transformation macros and constants ***/
-#define	PCB_MOVE(xs,ys,deltax,deltay)							\
+#define	PCB_MOVE_POINT(xs,ys,deltax,deltay)							\
 	{														\
 		((xs) += (deltax));									\
 		((ys) += (deltay));									\
Index: trunk/src/obj_arc.h
===================================================================
--- trunk/src/obj_arc.h	(revision 23091)
+++ trunk/src/obj_arc.h	(revision 23092)
@@ -99,7 +99,7 @@
 	do {                                                            \
 		pcb_coord_t __dx__ = (dx), __dy__ = (dy);                     \
 		pcb_arc_t *__a__ = (a);                                       \
-		PCB_MOVE((__a__)->X,(__a__)->Y,__dx__,__dy__)                 \
+		PCB_MOVE_POINT((__a__)->X,(__a__)->Y,__dx__,__dy__)                 \
 		PCB_BOX_MOVE_LOWLEVEL(&((__a__)->BoundingBox),__dx__,__dy__); \
 		PCB_BOX_MOVE_LOWLEVEL(&((__a__)->bbox_naked),__dx__,__dy__); \
 	} while(0)
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 23091)
+++ trunk/src/obj_line.c	(revision 23092)
@@ -602,7 +602,7 @@
 			pcb_line_invalidate_erase(Line);
 		pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line);
 		pcb_r_delete_entry(Layer->line_tree, &Line->BoundingBox);
-		PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
+		PCB_MOVE_POINT(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
 		pcb_line_bbox(Line);
 		pcb_r_insert_entry(Layer->line_tree, &Line->BoundingBox);
 		pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line);
@@ -615,7 +615,7 @@
 		if (ctx->move.pcb->RatOn)
 			pcb_rat_invalidate_erase((pcb_rat_t *) Line);
 		pcb_r_delete_entry(ctx->move.pcb->Data->rat_tree, &Line->BoundingBox);
-		PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
+		PCB_MOVE_POINT(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
 		pcb_line_bbox(Line);
 		pcb_r_insert_entry(ctx->move.pcb->Data->rat_tree, &Line->BoundingBox);
 		if (ctx->move.pcb->RatOn)
Index: trunk/src/obj_line.h
===================================================================
--- trunk/src/obj_line.h	(revision 23091)
+++ trunk/src/obj_line.h	(revision 23092)
@@ -100,8 +100,8 @@
 	do { \
 		pcb_coord_t __dx__ = (dx), __dy__ = (dy); \
 		pcb_line_t *__l__ = (l); \
-		PCB_MOVE((__l__)->Point1.X,(__l__)->Point1.Y,(__dx__),(__dy__)) \
-		PCB_MOVE((__l__)->Point2.X,(__l__)->Point2.Y,(__dx__),(__dy__)) \
+		PCB_MOVE_POINT((__l__)->Point1.X,(__l__)->Point1.Y,(__dx__),(__dy__)) \
+		PCB_MOVE_POINT((__l__)->Point2.X,(__l__)->Point2.Y,(__dx__),(__dy__)) \
 		pcb_line_bbox(__l__); \
 	} while(0)
 
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 23091)
+++ trunk/src/obj_poly.c	(revision 23092)
@@ -669,7 +669,7 @@
 {
 	PCB_POLY_POINT_LOOP(Polygon);
 	{
-		PCB_MOVE(point->X, point->Y, DX, DY);
+		PCB_MOVE_POINT(point->X, point->Y, DX, DY);
 	}
 	PCB_END_LOOP;
 	PCB_BOX_MOVE_LOWLEVEL(&Polygon->BoundingBox, DX, DY);
@@ -719,7 +719,7 @@
 		pcb_poly_invalidate_erase(Polygon);
 	}
 	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
-	PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
+	PCB_MOVE_POINT(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
 	pcb_poly_bbox(Polygon);
 	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
 	pcb_poly_remove_excess_points(Layer, Polygon);
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 23091)
+++ trunk/src/obj_text.h	(revision 23092)
@@ -112,7 +112,7 @@
 		pcb_text_t *__t__ = (t);                                         \
 		PCB_BOX_MOVE_LOWLEVEL(&((__t__)->BoundingBox), __dx__, __dy__);  \
 		PCB_BOX_MOVE_LOWLEVEL(&((__t__)->bbox_naked), __dx__, __dy__);  \
-		PCB_MOVE((__t__)->X, (__t__)->Y, __dx__, __dy__);                \
+		PCB_MOVE_POINT((__t__)->X, (__t__)->Y, __dx__, __dy__);                \
 	} while(0)
 
 /* Determines if text is actually visible */