Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5019) +++ trunk/doc-rnd/hacking/renames (revision 5020) @@ -861,3 +861,7 @@ pcb_via_set_size -> pcb_board_set_via_size pcb_via_set_drilling_hole -> pcb_board_set_via_drilling_hole pcb_conf_set_clearance_width -> pcb_board_set_clearance +stub_DrawFab_overhang -> pcb_stub_draw_fab_overhang +stub_DrawFab -> pcb_stub_draw_fab +stub_rat_found_short -> pcb_stub_rat_found_short +stub_rat_proc_shorts -> pcb_stub_rat_proc_shorts Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 5019) +++ trunk/src/draw.c (revision 5020) @@ -294,7 +294,7 @@ } if (gui->set_layer("fab", SL(FAB, 0), 0)) { - stub_DrawFab(Output.fgGC); + pcb_stub_draw_fab(Output.fgGC); gui->end_layer(); } } Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 5019) +++ trunk/src/rats.c (revision 5020) @@ -328,7 +328,7 @@ if (!pin->Spare) { pcb_message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to %s pin %s\n"), &theNet->Name[2], PCB_UNKNOWN(NAMEONPCB_NAME(element)), PCB_UNKNOWN(pin->Number)); - stub_rat_found_short(pin, NULL, &theNet->Name[2]); + pcb_stub_rat_found_short(pin, NULL, &theNet->Name[2]); continue; } newone = pcb_true; @@ -345,7 +345,7 @@ *menu = pin->Spare; pcb_message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to net \"%s\"\n"), &theNet->Name[2], &((pcb_lib_menu_t *) (pin->Spare))->Name[2]); - stub_rat_found_short(pin, NULL, &theNet->Name[2]); + pcb_stub_rat_found_short(pin, NULL, &theNet->Name[2]); } } } @@ -359,7 +359,7 @@ if (!pad->Spare) { pcb_message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to %s pad %s\n"), &theNet->Name[2], PCB_UNKNOWN(NAMEONPCB_NAME(element)), PCB_UNKNOWN(pad->Number)); - stub_rat_found_short(NULL, pad, &theNet->Name[2]); + pcb_stub_rat_found_short(NULL, pad, &theNet->Name[2]); continue; } newone = pcb_true; @@ -376,7 +376,7 @@ *menu = pad->Spare; pcb_message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to net \"%s\"\n"), &theNet->Name[2], &((pcb_lib_menu_t *) (pad->Spare))->Name[2]); - stub_rat_found_short(NULL, pad, &theNet->Name[2]); + pcb_stub_rat_found_short(NULL, pad, &theNet->Name[2]); } } } @@ -704,7 +704,7 @@ return (pcb_true); if (Warned || changed) { - stub_rat_proc_shorts(); + pcb_stub_rat_proc_shorts(); pcb_draw(); } Index: trunk/src/stub_draw_fab.c =================================================================== --- trunk/src/stub_draw_fab.c (revision 5019) +++ trunk/src/stub_draw_fab.c (revision 5020) @@ -45,6 +45,6 @@ DrawTextLowLevel(&t, 0); } -int (*stub_DrawFab_overhang)(void) = dummy_DrawFab_overhang; -void (*stub_DrawFab)(pcb_hid_gc_t gc) = dummy_DrawFab; +int (*pcb_stub_draw_fab_overhang)(void) = dummy_DrawFab_overhang; +void (*pcb_stub_draw_fab)(pcb_hid_gc_t gc) = dummy_DrawFab; Index: trunk/src/stub_draw_fab.h =================================================================== --- trunk/src/stub_draw_fab.h (revision 5019) +++ trunk/src/stub_draw_fab.h (revision 5020) @@ -31,7 +31,7 @@ #include "hid.h" -extern int (*stub_DrawFab_overhang)(void); -extern void (*stub_DrawFab)(pcb_hid_gc_t gc); +extern int (*pcb_stub_draw_fab_overhang)(void); +extern void (*pcb_stub_draw_fab)(pcb_hid_gc_t gc); #endif Index: trunk/src/stub_mincut.c =================================================================== --- trunk/src/stub_mincut.c (revision 5019) +++ trunk/src/stub_mincut.c (revision 5020) @@ -41,5 +41,5 @@ stub_rat_proc_shorts_dummy(); } -void (*stub_rat_found_short)(pcb_pin_t * pin, pcb_pad_t * pad, const char *with_net) = stub_rat_found_short_dummy; -void (*stub_rat_proc_shorts)(void) = stub_rat_proc_shorts_dummy; +void (*pcb_stub_rat_found_short)(pcb_pin_t * pin, pcb_pad_t * pad, const char *with_net) = stub_rat_found_short_dummy; +void (*pcb_stub_rat_proc_shorts)(void) = stub_rat_proc_shorts_dummy; Index: trunk/src/stub_mincut.h =================================================================== --- trunk/src/stub_mincut.h (revision 5019) +++ trunk/src/stub_mincut.h (revision 5020) @@ -22,6 +22,6 @@ #include "global_typedefs.h" -extern void (*stub_rat_found_short)(pcb_pin_t * pin, pcb_pad_t * pad, const char *with_net); -extern void (*stub_rat_proc_shorts)(void); +extern void (*pcb_stub_rat_found_short)(pcb_pin_t * pin, pcb_pad_t * pad, const char *with_net); +extern void (*pcb_stub_rat_proc_shorts)(void); Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 5019) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 5020) @@ -296,7 +296,7 @@ pcb_uninit_t hid_draw_fab_init(void) { - stub_DrawFab = DrawFab; - stub_DrawFab_overhang = DrawFab_overhang; + pcb_stub_draw_fab = DrawFab; + pcb_stub_draw_fab_overhang = DrawFab_overhang; return hid_draw_fab_uninit; } Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 5019) +++ trunk/src_plugins/export_ps/ps.c (revision 5020) @@ -899,7 +899,7 @@ * sizes, they can always ignore this sheet. */ if (SL_TYPE(idx) == SL_FAB) { pcb_coord_t natural = boffset - PCB_MIL_TO_COORD(500) - PCB->MaxHeight / 2; - pcb_coord_t needed = stub_DrawFab_overhang(); + pcb_coord_t needed = pcb_stub_draw_fab_overhang(); pcb_fprintf(global.f, "%% PrintFab overhang natural %mi, needed %mi\n", natural, needed); if (needed > natural) pcb_fprintf(global.f, "0 %mi translate\n", needed - natural); Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 5019) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 5020) @@ -404,8 +404,8 @@ #include "stub_mincut.h" pcb_uninit_t hid_mincut_init(void) { - stub_rat_found_short = rat_found_short; - stub_rat_proc_shorts = rat_proc_shorts; + pcb_stub_rat_found_short = rat_found_short; + pcb_stub_rat_proc_shorts = rat_proc_shorts; #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ conf_reg_field(conf_mincut, field,isarray,type_name,cpath,cname,desc,flags); #include "rats_mincut_conf_fields.h"