Index: trunk/src/obj_arc.h
===================================================================
--- trunk/src/obj_arc.h	(revision 4963)
+++ trunk/src/obj_arc.h	(revision 4964)
@@ -61,13 +61,13 @@
 void pcb_arc_set_angles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da);
 void pcb_arc_set_radii(pcb_layer_t *Layer, pcb_arc_t *a, pcb_coord_t new_width, pcb_coord_t new_height);
 
-#define	pcb_arc_move(a,dx,dy)                                \
-	{                                                               \
+#define	pcb_arc_move(a,dx,dy)                                     \
+	do {                                                            \
 		pcb_coord_t __dx__ = (dx), __dy__ = (dy);                     \
 		pcb_arc_t *__a__ = (a);                                       \
 		PCB_MOVE((__a__)->X,(__a__)->Y,__dx__,__dy__)                 \
 		PCB_BOX_MOVE_LOWLEVEL(&((__a__)->BoundingBox),__dx__,__dy__); \
-	}
+	} while(0)
 
 #define ARC_LOOP(element) do {                                      \
   pcb_arc_t *arc;                                                   \
Index: trunk/src/obj_line.h
===================================================================
--- trunk/src/obj_line.h	(revision 4963)
+++ trunk/src/obj_line.h	(revision 4964)
@@ -70,13 +70,13 @@
  * boxes are updated too.
  */
 #define pcb_line_move(l,dx,dy) \
-	{ \
+	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_line_bbox(__l__); \
-	}
+	} while(0)
 
 
 #define LINE_LOOP(layer) do {                                       \
Index: trunk/src/obj_pad.h
===================================================================
--- trunk/src/obj_pad.h	(revision 4963)
+++ trunk/src/obj_pad.h	(revision 4964)
@@ -54,13 +54,13 @@
  * boxes are updated too.
  */
 #define pcb_pad_move(p,dx,dy) \
-	{ \
+	do { \
 		pcb_coord_t __dx__ = (dx), __dy__ = (dy); \
 		pcb_pad_t *__p__ = (p); \
 		PCB_MOVE((__p__)->Point1.X,(__p__)->Point1.Y,(__dx__),(__dy__)) \
 		PCB_MOVE((__p__)->Point2.X,(__p__)->Point2.Y,(__dx__),(__dy__)) \
 		pcb_pad_bbox((__p__)); \
-	}
+	} while(0)
 
 #define PAD_LOOP(element) do {                                      \
 	pcb_pad_t *pad;                                                     \
Index: trunk/src/obj_pinvia.h
===================================================================
--- trunk/src/obj_pinvia.h	(revision 4963)
+++ trunk/src/obj_pinvia.h	(revision 4964)
@@ -63,12 +63,12 @@
 
 
 #define pcb_via_move(v,dx,dy) \
-	{ \
+	do { \
 		pcb_coord_t __dx__ = (dx), __dy__ = (dy); \
 		pcb_pin_t *__v__ = (v); \
 		PCB_MOVE((__v__)->X,(__v__)->Y,(__dx__),(__dy__)) \
 		PCB_BOX_MOVE_LOWLEVEL(&((__v__)->BoundingBox),(__dx__),(__dy__)); \
-	}
+	} while(0)
 
 #define pcb_pin_move(p,dx,dy) pcb_via_move(p, dx, dy)
 
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 4963)
+++ trunk/src/obj_text.h	(revision 4964)
@@ -54,13 +54,13 @@
 void pcb_text_bbox(pcb_font_t *FontPtr, pcb_text_t *Text);
 void pcb_text_rotate90(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
 
-#define	pcb_text_move(t,dx,dy)                                  \
-	{                                                                  \
+#define pcb_text_move(t,dx,dy)                                       \
+	do {                                                               \
 		pcb_coord_t __dx__ = (dx), __dy__ = (dy);                        \
 		pcb_text_t *__t__ = (t);                                         \
 		PCB_BOX_MOVE_LOWLEVEL(&((__t__)->BoundingBox), __dx__, __dy__);  \
 		PCB_MOVE((__t__)->X, (__t__)->Y, __dx__, __dy__);                \
-	}
+	} while(0)
 
 /* Determines if text is actually visible */
 #define pcb_text_is_visible(b, l, t)      ((l)->On)