Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5071)
+++ trunk/doc-rnd/hacking/renames	(revision 5072)
@@ -1134,3 +1134,4 @@
 R_DIR_NOT_FOUND -> PCB_R_DIR_NOT_FOUND
 R_DIR_FOUND_CONTINUE -> PCB_R_DIR_FOUND_CONTINUE
 R_DIR_CANCEL -> PCB_R_DIR_CANCEL
+SLOP -> PCB_SLOP
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 5071)
+++ trunk/src/action_helper.c	(revision 5072)
@@ -327,10 +327,10 @@
 			}
 			pcb_crosshair.dragx = Note.X;
 			pcb_crosshair.dragy = Note.Y;
-			box.X1 = Note.X + SLOP * pcb_pixel_slop;
-			box.X2 = Note.X - SLOP * pcb_pixel_slop;
-			box.Y1 = Note.Y + SLOP * pcb_pixel_slop;
-			box.Y2 = Note.Y - SLOP * pcb_pixel_slop;
+			box.X1 = Note.X + PCB_SLOP * pcb_pixel_slop;
+			box.X2 = Note.X - PCB_SLOP * pcb_pixel_slop;
+			box.Y1 = Note.Y + PCB_SLOP * pcb_pixel_slop;
+			box.Y2 = Note.Y - PCB_SLOP * pcb_pixel_slop;
 			pcb_crosshair.drags = pcb_list_block(&box, &pcb_crosshair.drags_len);
 			pcb_crosshair.drags_current = 0;
 			AttachForCopy(Note.X, Note.Y);
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 5071)
+++ trunk/src/gui_act.c	(revision 5072)
@@ -800,7 +800,7 @@
 
 static const char cycledrag_help[] = "Cycle through which object is being dragged";
 
-#define close_enough(a, b) ((((a)-(b)) > 0) ? ((a)-(b) < (SLOP * pcb_pixel_slop)) : ((a)-(b) > -(SLOP * pcb_pixel_slop)))
+#define close_enough(a, b) ((((a)-(b)) > 0) ? ((a)-(b) < (PCB_SLOP * pcb_pixel_slop)) : ((a)-(b) > -(PCB_SLOP * pcb_pixel_slop)))
 static int ActionCycleDrag(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
 	void *ptr1, *ptr2, *ptr3;
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 5071)
+++ trunk/src/search.c	(revision 5072)
@@ -1325,7 +1325,7 @@
 {
 	int ans;
 
-	ans = pcb_search_obj_by_location(Type, Result1, Result2, Result3, X, Y, SLOP * pcb_pixel_slop);
+	ans = pcb_search_obj_by_location(Type, Result1, Result2, Result3, X, Y, PCB_SLOP * pcb_pixel_slop);
 	return (ans);
 }
 
Index: trunk/src/search.h
===================================================================
--- trunk/src/search.h	(revision 5071)
+++ trunk/src/search.h	(revision 5072)
@@ -35,7 +35,7 @@
 
 int pcb_lines_intersect(pcb_coord_t ax1, pcb_coord_t ay1, pcb_coord_t ax2, pcb_coord_t ay2, pcb_coord_t bx1, pcb_coord_t by1, pcb_coord_t bx2, pcb_coord_t by2);
 
-#define SLOP 5
+#define PCB_SLOP 5
 /* ---------------------------------------------------------------------------
  * some useful macros
  */