Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5041) +++ trunk/doc-rnd/hacking/renames (revision 5042) @@ -985,3 +985,5 @@ FCT_RAT -> PCB_FCT_RAT FCT_ELEMENT -> PCB_FCT_ELEMENT FCT_START -> PCB_FCT_START +find_callback_t -> pcb_find_callback_t +find_callback -> pcb_find_callback Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 5041) +++ trunk/src/find.c (revision 5042) @@ -132,11 +132,11 @@ static int OldFlag = PCB_FLAG_FOUND; static void *thing_ptr1, *thing_ptr2, *thing_ptr3; static int thing_type; -find_callback_t find_callback = NULL; +pcb_find_callback_t pcb_find_callback = NULL; #define make_callback(current_type, current_ptr, from_type, from_ptr, type) \ do { \ - if (find_callback != NULL) \ - find_callback(current_type, current_ptr, from_type, from_ptr, type); \ + if (pcb_find_callback != NULL) \ + pcb_find_callback(current_type, current_ptr, from_type, from_ptr, type); \ } while(0) static pcb_bool User = pcb_false; /* user action causing this */ Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 5041) +++ trunk/src/find.h (revision 5042) @@ -40,8 +40,8 @@ PCB_FCT_START = 16 /* starting object of a query */ } pcb_found_conn_type_t; -typedef void (*find_callback_t) (int current_type, void *current_ptr, int from_type, void *from_ptr, - pcb_found_conn_type_t conn_type); +typedef void (*pcb_find_callback_t)(int current_type, void *current_ptr, int from_type, void *from_ptr, + pcb_found_conn_type_t conn_type); /* if not NULL, this function is called whenever something is found @@ -48,7 +48,7 @@ (in LookupConnections for example). The caller should save the original value and set that back around the call, if the callback needs to be changed. */ -extern find_callback_t find_callback; +extern pcb_find_callback_t pcb_find_callback; /* --------------------------------------------------------------------------- * some local defines Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 5041) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 5042) @@ -98,7 +98,7 @@ /* returns 0 on succes */ static int proc_short(pcb_pin_t * pin, pcb_pad_t * pad, int ignore) { - find_callback_t old_cb; + pcb_find_callback_t old_cb; pcb_coord_t x, y; short_conn_t *n, **lut_by_oid, **lut_by_gid, *next; int gids; @@ -143,8 +143,8 @@ short_conns_maxid = 0; /* perform a search using PCB_FLAG_MINCUT, calling back proc_short_cb() with the connections */ - old_cb = find_callback; - find_callback = proc_short_cb; + old_cb = pcb_find_callback; + pcb_find_callback = proc_short_cb; pcb_save_find_flag(PCB_FLAG_MINCUT); pcb_lookup_conn(x, y, pcb_false, 1, PCB_FLAG_MINCUT); @@ -330,7 +330,7 @@ pcb_reset_found_pins_vias_pads(pcb_false); pcb_restore_find_flag(); - find_callback = old_cb; + pcb_find_callback = old_cb; return bad_gr; }