Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 5000)
+++ trunk/src/buffer.c	(revision 5001)
@@ -272,7 +272,7 @@
 	ENDALL_LOOP;
 
 	/* finally the origin and the bounding box */
-	PCB_ROTATE90(Buffer->X, Buffer->Y, Buffer->X, Buffer->Y, Number);
+	PCB_COORD_ROTATE90(Buffer->X, Buffer->Y, Buffer->X, Buffer->Y, Number);
 	pcb_box_rotate90(&Buffer->BoundingBox, Buffer->X, Buffer->Y, Number);
 }
 
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 5000)
+++ trunk/src/obj_arc.c	(revision 5001)
@@ -529,7 +529,7 @@
 
 	/* add Number*90 degrees (i.e., Number quarter-turns) */
 	Arc->StartAngle = NormalizeAngle(Arc->StartAngle + Number * 90);
-	PCB_ROTATE90(Arc->X, Arc->Y, X, Y, Number);
+	PCB_COORD_ROTATE90(Arc->X, Arc->Y, X, Y, Number);
 
 	/* now change width and height */
 	if (Number == 1 || Number == 3) {
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 5000)
+++ trunk/src/obj_elem.c	(revision 5001)
@@ -1101,7 +1101,7 @@
 		pcb_arc_rotate90(arc, X, Y, Number);
 	}
 	END_LOOP;
-	PCB_ROTATE90(Element->MarkX, Element->MarkY, X, Y, Number);
+	PCB_COORD_ROTATE90(Element->MarkX, Element->MarkY, X, Y, Number);
 	/* SetElementBoundingBox reenters the rtree data */
 	pcb_element_bbox(Data, Element, &PCB->Font);
 	pcb_poly_clear_from_poly(Data, PCB_TYPE_ELEMENT, Element, Element);
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 5000)
+++ trunk/src/obj_line.c	(revision 5001)
@@ -620,8 +620,8 @@
 /* rotates a line in 90 degree steps */
 void pcb_line_rotate90(pcb_line_t *Line, pcb_coord_t X, pcb_coord_t Y, unsigned Number)
 {
-	PCB_ROTATE90(Line->Point1.X, Line->Point1.Y, X, Y, Number);
-	PCB_ROTATE90(Line->Point2.X, Line->Point2.Y, X, Y, Number);
+	PCB_COORD_ROTATE90(Line->Point1.X, Line->Point1.Y, X, Y, Number);
+	PCB_COORD_ROTATE90(Line->Point2.X, Line->Point2.Y, X, Y, Number);
 	/* keep horizontal, vertical Point2 > Point1 */
 	if (Line->Point1.X == Line->Point2.X) {
 		if (Line->Point1.Y > Line->Point2.Y) {
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 5000)
+++ trunk/src/obj_poly.c	(revision 5001)
@@ -123,7 +123,7 @@
 {
 	PCB_POLY_POINT_LOOP(Polygon);
 	{
-		PCB_ROTATE90(point->X, point->Y, X, Y, Number);
+		PCB_COORD_ROTATE90(point->X, point->Y, X, Y, Number);
 	}
 	END_LOOP;
 	pcb_box_rotate90(&Polygon->BoundingBox, X, Y, Number);
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 5000)
+++ trunk/src/obj_text.c	(revision 5001)
@@ -440,7 +440,7 @@
 
 	number = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text) ? (4 - Number) & 3 : Number;
 	pcb_box_rotate90(&Text->BoundingBox, X, Y, Number);
-	PCB_ROTATE90(Text->X, Text->Y, X, Y, Number);
+	PCB_COORD_ROTATE90(Text->X, Text->Y, X, Y, Number);
 
 	/* set new direction, 0..3,
 	 * 0-> to the right, 1-> straight up,
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 5000)
+++ trunk/src/rotate.c	(revision 5001)
@@ -72,7 +72,7 @@
  */
 void pcb_point_rotate90(pcb_point_t *Point, pcb_coord_t X, pcb_coord_t Y, unsigned Number)
 {
-	PCB_ROTATE90(Point->X, Point->Y, X, Y, Number);
+	PCB_COORD_ROTATE90(Point->X, Point->Y, X, Y, Number);
 }
 
 /* ---------------------------------------------------------------------------
@@ -82,8 +82,8 @@
 {
 	pcb_coord_t x1 = Box->X1, y1 = Box->Y1, x2 = Box->X2, y2 = Box->Y2;
 
-	PCB_ROTATE90(x1, y1, X, Y, Number);
-	PCB_ROTATE90(x2, y2, X, Y, Number);
+	PCB_COORD_ROTATE90(x1, y1, X, Y, Number);
+	PCB_COORD_ROTATE90(x2, y2, X, Y, Number);
 	Box->X1 = MIN(x1, x2);
 	Box->Y1 = MIN(y1, y2);
 	Box->X2 = MAX(x1, x2);
Index: trunk/src/rotate.h
===================================================================
--- trunk/src/rotate.h	(revision 5000)
+++ trunk/src/rotate.h	(revision 5001)
@@ -35,7 +35,7 @@
 /* ---------------------------------------------------------------------------
  * some useful transformation macros and constants
  */
-#define	PCB_ROTATE90(x,y,x0,y0,n)							\
+#define	PCB_COORD_ROTATE90(x,y,x0,y0,n)							\
 	do {												\
 		pcb_coord_t	dx = (x)-(x0),					\
 					dy = (y)-(y0);					\
@@ -76,13 +76,13 @@
 
 #define	PCB_VIA_ROTATE90(v,x0,y0,n)	\
 do { \
-	PCB_ROTATE90((v)->X,(v)->Y,(x0),(y0),(n)); \
+	PCB_COORD_ROTATE90((v)->X,(v)->Y,(x0),(y0),(n)); \
 	PCB_PIN_ROTATE_SHAPE(v, (n)); \
 } while(0)
 
 #define	PCB_PIN_ROTATE90(p,x0,y0,n)	\
 do { \
-	PCB_ROTATE90((p)->X,(p)->Y,(x0),(y0),(n)); \
+	PCB_COORD_ROTATE90((p)->X,(p)->Y,(x0),(y0),(n)); \
 	PCB_PIN_ROTATE_SHAPE((p), (n)); \
 } while(0)