Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 4527) +++ trunk/src/Makefile.dep (revision 4528) @@ -88,8 +88,9 @@ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h library.h rats_patch.h board.h \ list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ - drc.h data.h global_element.h list_element.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + drc.h rats.h netlist.h route_style.h data.h global_element.h \ + list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ hid.h misc.h ../src_3rd/genvector/gds_char.h mymem.h create.h rtree.h \ undo.h plugins.h hid_actions.h dolists.h @@ -1016,15 +1017,16 @@ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h globalconst.h error.h search.h \ global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h \ - misc_util.h draw.h hid.h error.h drc.h layer.h list_line.h list_arc.h \ - list_text.h list_poly.h pcb-printf.h undo.h library.h set.h \ - ../src_plugins/hid_gtk/gui.h board.h const.h macro.h vtroutestyle.h \ - layer.h rats_patch.h board.h list_common.h list_pad.h list_pin.h \ - list_rat.h vtonpoint.h hid.h hid_cfg.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h global_element.h \ - list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - misc.h mymem.h ../src_plugins/hid_gtk/ghid-coord-entry.h unit.h \ + rats.h netlist.h library.h route_style.h vtroutestyle.h misc_util.h \ + draw.h hid.h error.h drc.h layer.h list_line.h list_arc.h list_text.h \ + list_poly.h pcb-printf.h undo.h set.h ../src_plugins/hid_gtk/gui.h \ + board.h const.h macro.h layer.h rats_patch.h board.h list_common.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h hid_cfg.h \ + hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h \ + global_element.h list_element.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ + crosshair.h rubberband.h buffer.h misc.h mymem.h \ + ../src_plugins/hid_gtk/ghid-coord-entry.h unit.h \ ../src_plugins/hid_gtk/ghid-main-menu.h \ ../src_plugins/hid_gtk/ghid-layer-selector.h \ ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h \ @@ -1170,7 +1172,7 @@ ../src_plugins/hid_gtk/gui-pinout-preview.h \ ../src_plugins/hid_gtk/ghid-propedit.h event.h compat_misc.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h create.h draw.h error.h \ - find.h mymem.h rats.h netlist.h route_style.h remove.h search.h \ + find.h mymem.h rats.h netlist.h route_style.h remove.h search.h rats.h \ misc_util.h select.h operation.h set.h undo.h hid_actions.h compat_nls.h ../src_plugins/hid_gtk/gui-output-events.o: \ ../src_plugins/hid_gtk/gui-output-events.c ../config.h conf_core.h \ @@ -1199,8 +1201,8 @@ ../src_plugins/hid_gtk/ghid-propedit.h event.h compat_misc.h \ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h action_helper.h crosshair.h \ - draw.h error.h layer.h set.h find.h search.h misc_util.h rats.h \ - netlist.h route_style.h + draw.h error.h layer.h set.h find.h search.h rats.h netlist.h \ + route_style.h misc_util.h rats.h ../src_plugins/hid_gtk/gui-pinout-preview.o: \ ../src_plugins/hid_gtk/gui-pinout-preview.c ../config.h conf_core.h \ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -1285,7 +1287,7 @@ action_helper.h buffer.h change.h copy.h create.h crosshair.h draw.h \ error.h plug_io.h find.h insert.h line.h mymem.h layer.h move.h \ pcb-printf.h polygon.h rtree.h math_helper.h rats.h netlist.h \ - route_style.h remove.h rotate.h rubberband.h search.h misc_util.h \ + route_style.h remove.h rotate.h rubberband.h search.h rats.h misc_util.h \ select.h operation.h set.h undo.h free_atexit.h paths.h \ ../src_plugins/hid_gtk/gui-icons-mode-buttons.data \ ../src_plugins/hid_gtk/gui-icons-misc.data \ @@ -1933,8 +1935,8 @@ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ find.h misc.h mymem.h mymem.h polygon.h rtree.h math_helper.h rats.h \ - netlist.h route_style.h vtroutestyle.h search.h misc_util.h set.h undo.h \ - plugins.h compat_misc.h ../src_plugins/mincut/pcb-mincut/graph.h \ + netlist.h route_style.h vtroutestyle.h search.h rats.h misc_util.h set.h \ + undo.h plugins.h compat_misc.h ../src_plugins/mincut/pcb-mincut/graph.h \ ../src_plugins/mincut/pcb-mincut/../../../config.h \ ../src_plugins/mincut/pcb-mincut/solve.h \ ../src_plugins/mincut/pcb-mincut/graph.h conf.h \ @@ -2211,11 +2213,12 @@ rats_patch.h board.h list_common.h list_pad.h list_pin.h list_rat.h \ data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ - crosshair.h buffer.h drill.h error.h search.h misc_util.h misc.h mymem.h \ - mymem.h rats.h netlist.h route_style.h rtree.h flag_str.h macro.h undo.h \ - find.h draw.h pcb-printf.h plugins.h action_helper.h hid_actions.h \ - misc_util.h ../src_plugins/report/report_conf.h conf.h compat_misc.h \ - compat_nls.h layer.h ../src_3rd/genregex/regex_sei.h \ + crosshair.h buffer.h drill.h error.h search.h rats.h netlist.h \ + route_style.h misc_util.h misc.h mymem.h mymem.h rats.h rtree.h \ + flag_str.h macro.h undo.h find.h draw.h pcb-printf.h plugins.h \ + action_helper.h hid_actions.h misc_util.h \ + ../src_plugins/report/report_conf.h conf.h compat_misc.h compat_nls.h \ + layer.h ../src_3rd/genregex/regex_sei.h \ ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h dolists.h \ ../src_plugins/report/report_conf_fields.h ../src_plugins/shand_cmd/command.o: ../src_plugins/shand_cmd/command.c \ @@ -2534,8 +2537,8 @@ list_rat.h layer.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \ drc.h buffer.h funchash_core.h funchash.h funchash_core_list.h board.h \ const.h macro.h vtroutestyle.h library.h rats_patch.h action_helper.h \ - hid_actions.h change.h draw.h search.h misc_util.h misc.h mymem.h set.h \ - undo.h compat_misc.h compat_nls.h + hid_actions.h change.h draw.h search.h rats.h netlist.h route_style.h \ + misc_util.h misc.h mymem.h set.h undo.h compat_misc.h compat_nls.h clip.o: clip.c ../config.h clip.h global_typedefs.h pcb_bool.h unit.h compat_dl.o: compat_dl.c ../config.h compat_dl.h compat_inc.h compat_fs.o: compat_fs.c ../config.h compat_inc.h compat_fs.h \ @@ -2636,8 +2639,9 @@ vtonpoint.h hid.h error.h drc.h math_helper.h create.h rubberband.h \ data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ - crosshair.h buffer.h misc.h mymem.h rtree.h search.h misc_util.h undo.h \ - plug_io.h stub_vendor.h hid_actions.h paths.h compat_misc.h compat_nls.h + crosshair.h buffer.h misc.h mymem.h rtree.h search.h rats.h netlist.h \ + route_style.h misc_util.h undo.h plug_io.h stub_vendor.h hid_actions.h \ + paths.h compat_misc.h compat_nls.h crosshair.o: crosshair.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -2655,8 +2659,8 @@ crosshair.h rubberband.h data.h global_element.h list_element.h \ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h buffer.h draw.h line.h rtree.h \ - search.h polygon.h misc.h mymem.h hid_actions.h compat_misc.h \ - compat_nls.h + search.h rats.h netlist.h route_style.h polygon.h misc.h mymem.h \ + hid_actions.h compat_misc.h compat_nls.h data.o: data.c ../config.h board.h const.h macro.h global_typedefs.h \ pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ @@ -2748,7 +2752,8 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h rubberband.h buffer.h action_helper.h set.h plug_io.h \ plug_import.h misc.h mymem.h remove.h create.h draw.h find.h search.h \ - misc_util.h hid_actions.h hid_attrib.h compat_misc.h compat_nls.h + rats.h netlist.h route_style.h misc_util.h hid_actions.h hid_attrib.h \ + compat_misc.h compat_nls.h find.o: find.c ../config.h const.h math_helper.h conf_core.h conf.h \ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ @@ -2765,8 +2770,8 @@ ../src_3rd/liblihata/genht/hash.h list_common.h list_text.h list_poly.h \ list_rat.h layer.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \ drc.h buffer.h draw.h find.h misc.h mymem.h rtree.h polygon.h search.h \ - misc_util.h set.h undo.h library.h rats.h netlist.h route_style.h \ - vtroutestyle.h plug_io.h hid_actions.h compat_misc.h find_geo.c macro.h \ + rats.h netlist.h library.h route_style.h vtroutestyle.h misc_util.h \ + set.h undo.h plug_io.h hid_actions.h compat_misc.h find_geo.c macro.h \ find_lookup.c compat_nls.h board.h rats_patch.h find_drc.c find_misc.c \ find_clear.c find_debug.c find_print.c find_act.o: find_act.c ../config.h board.h const.h macro.h \ @@ -2813,9 +2818,9 @@ list_conf.h data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h rubberband.h buffer.h action_helper.h undo.h funchash_core.h \ - funchash.h funchash_core_list.h draw.h search.h misc_util.h find.h set.h \ - misc.h mymem.h stub_stroke.h hid_actions.h hid_init.h route_style.h \ - compat_nls.h + funchash.h funchash_core_list.h draw.h search.h rats.h netlist.h \ + route_style.h misc_util.h find.h set.h misc.h mymem.h stub_stroke.h \ + hid_actions.h hid_init.h compat_nls.h heap.o: heap.c ../config.h heap.h hid_actions.o: hid_actions.c ../config.h conf_core.h conf.h \ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -2952,8 +2957,8 @@ list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ drc.h crosshair.h data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ - buffer.h draw.h line.h misc.h mymem.h polygon.h rtree.h search.h \ - misc_util.h select.h operation.h set.h undo.h + buffer.h draw.h line.h misc.h mymem.h polygon.h rtree.h search.h rats.h \ + netlist.h route_style.h misc_util.h select.h operation.h set.h undo.h intersect.o: intersect.c ../config.h intersect.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \ global_typedefs.h pcb_bool.h unit.h polyarea.h box.h math_helper.h \ @@ -3135,8 +3140,8 @@ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h buffer.h draw.h misc.h mymem.h move.h polygon.h rtree.h \ - math_helper.h search.h misc_util.h select.h operation.h undo.h \ - hid_actions.h compat_misc.h compat_nls.h + math_helper.h search.h rats.h netlist.h route_style.h misc_util.h \ + select.h operation.h undo.h hid_actions.h compat_misc.h compat_nls.h mymem.o: mymem.c ../config.h data.h globalconst.h global_typedefs.h \ pcb_bool.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ flag.h polyarea.h global_element.h list_pin.h \ @@ -3210,9 +3215,9 @@ list_rat.h layer.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \ drc.h buffer.h math_helper.h board.h const.h macro.h vtroutestyle.h \ library.h rats_patch.h action_helper.h change.h undo.h funchash_core.h \ - funchash.h funchash_core_list.h search.h misc_util.h move.h draw.h \ - mirror.h rotate.h set.h copy.h misc.h mymem.h remove.h create.h \ - compat_misc.h compat_nls.h + funchash.h funchash_core_list.h search.h rats.h netlist.h route_style.h \ + misc_util.h move.h draw.h mirror.h rotate.h set.h copy.h misc.h mymem.h \ + remove.h create.h compat_misc.h compat_nls.h paths.o: paths.c ../config.h paths.h error.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3296,7 +3301,8 @@ rubberband.h crosshair.h data.h global_element.h list_element.h \ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h buffer.h draw.h polygon.h rtree.h \ - remove.h search.h set.h thermal.h mymem.h undo.h misc.h compat_nls.h + remove.h search.h rats.h netlist.h route_style.h set.h thermal.h mymem.h \ + undo.h misc.h compat_nls.h polygon1.o: polygon1.c rtree.h global_typedefs.h ../config.h pcb_bool.h \ unit.h math_helper.h heap.h compat_cc.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ @@ -3319,7 +3325,8 @@ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ action_helper.h undo.h funchash_core.h funchash.h funchash_core_list.h \ - polygon.h rtree.h math_helper.h draw.h search.h misc_util.h compat_nls.h + polygon.h rtree.h math_helper.h draw.h search.h rats.h netlist.h \ + route_style.h misc_util.h compat_nls.h ptrlist.o: ptrlist.c global_typedefs.h ../config.h pcb_bool.h unit.h \ ptrlist.h rats.o: rats.c ../config.h conf_core.h conf.h global_typedefs.h \ @@ -3391,8 +3398,8 @@ vtonpoint.h hid.h error.h drc.h data.h global_element.h list_element.h \ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - draw.h misc.h mymem.h move.h polygon.h rtree.h math_helper.h remove.h \ - select.h operation.h undo.h + rats.h netlist.h route_style.h draw.h misc.h mymem.h move.h polygon.h \ + rtree.h math_helper.h remove.h select.h operation.h undo.h remove_act.o: remove_act.c const.h ../config.h data.h globalconst.h \ global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h \ @@ -3418,12 +3425,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ draw.h misc.h ../src_3rd/genvector/gds_char.h mymem.h polygon.h rtree.h \ - math_helper.h rotate.h search.h misc_util.h select.h operation.h set.h \ - undo.h conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ - compat_nls.h + math_helper.h rotate.h search.h rats.h netlist.h route_style.h \ + misc_util.h select.h operation.h set.h undo.h conf_core.h conf.h \ + pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ + ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/genvector/vtp0.h list_conf.h compat_nls.h route_style.o: route_style.c ../config.h const.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h unit.h route_style.h \ @@ -3471,7 +3478,7 @@ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h rubberband.h buffer.h find.h polygon.h rtree.h search.h \ - misc.h mymem.h + rats.h netlist.h route_style.h misc.h mymem.h select.o: select.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3488,8 +3495,8 @@ vtonpoint.h hid.h error.h drc.h data.h global_element.h list_element.h \ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - draw.h search.h misc_util.h select.h operation.h undo.h rats.h netlist.h \ - route_style.h misc.h mymem.h find.h compat_misc.h compat_nls.h \ + draw.h search.h rats.h netlist.h route_style.h misc_util.h select.h \ + operation.h undo.h misc.h mymem.h find.h compat_misc.h compat_nls.h \ ../src_3rd/genregex/regex_sei.h ../src_3rd/genregex/regex_templ.h \ ../src_3rd/genregex/regex.h select_act.o: select_act.c ../config.h math_helper.h conf_core.h conf.h \ @@ -3559,13 +3566,12 @@ ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h draw.h insert.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h mirror.h move.h polygon.h \ - rtree.h math_helper.h remove.h rotate.h search.h misc_util.h set.h \ - undo.h flag_str.h conf_core.h conf.h pcb-printf.h \ - ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \ + rtree.h math_helper.h remove.h rotate.h search.h rats.h netlist.h \ + route_style.h misc_util.h set.h undo.h flag_str.h conf_core.h conf.h \ + pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h compat_nls.h \ - netlist.h route_style.h + ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h compat_nls.h undo_act.o: undo_act.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3583,8 +3589,8 @@ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ action_helper.h funchash_core.h funchash.h funchash_core_list.h undo.h \ - polygon.h rtree.h math_helper.h set.h search.h misc_util.h draw.h misc.h \ - mymem.h + polygon.h rtree.h math_helper.h set.h search.h rats.h netlist.h \ + route_style.h misc_util.h draw.h misc.h mymem.h unit.o: unit.c ../config.h const.h compat_misc.h compat_nls.h unit.h vtlibrary.o: vtlibrary.c vtlibrary.h global_objs.h \ ../src_3rd/genlist/gendlist.h ../config.h attrib.h flag.h globalconst.h \ Index: trunk/src/buffer.h =================================================================== --- trunk/src/buffer.h (revision 4527) +++ trunk/src/buffer.h (revision 4528) @@ -60,4 +60,9 @@ /* This action is called from ActionElementAddIf() */ int LoadFootprint(int argc, const char **argv, Coord x, Coord y); +/* --------------------------------------------------------------------------- + * access macro for current buffer + */ +#define PASTEBUFFER (&Buffers[conf_core.editor.buffer_number]) + #endif Index: trunk/src/macro.h =================================================================== --- trunk/src/macro.h (revision 4527) +++ trunk/src/macro.h (revision 4528) @@ -53,11 +53,6 @@ #define OBJECT_ID(p) (((AnyObjectTypePtr) p)->ID) /* --------------------------------------------------------------------------- - * access macro for current buffer - */ -#define PASTEBUFFER (&Buffers[conf_core.editor.buffer_number]) - -/* --------------------------------------------------------------------------- * access macros for elements name structure */ #define DESCRIPTION_INDEX 0 @@ -117,37 +112,11 @@ { \ drill = &(top)->Drill[n] -#define NETLIST_LOOP(top) do { \ - pcb_cardinal_t n; \ - NetListTypePtr netlist; \ - for (n = (top)->NetListN-1; n != -1; n--) \ - { \ - netlist = &(top)->NetList[n] - -#define NET_LOOP(top) do { \ - pcb_cardinal_t n; \ - NetTypePtr net; \ - for (n = (top)->NetN-1; n != -1; n--) \ - { \ - net = &(top)->Net[n] - -#define CONNECTION_LOOP(net) do { \ - pcb_cardinal_t n; \ - ConnectionTypePtr connection; \ - for (n = (net)->ConnectionN-1; n != -1; n--) \ - { \ - connection = & (net)->Connection[n] - #define ELEMENT_LOOP(top) do { \ ElementType *element; \ gdl_iterator_t __it__; \ pinlist_foreach(&(top)->Element, &__it__, element) { -#define RAT_LOOP(top) do { \ - RatType *line; \ - gdl_iterator_t __it__; \ - ratlist_foreach(&(top)->Rat, &__it__, line) { - #define ELEMENTTEXT_LOOP(element) do { \ pcb_cardinal_t n; \ TextTypePtr text; \ @@ -324,5 +293,4 @@ if (layer->On) \ POLYGON_LOOP(layer) - #endif Index: trunk/src/netlist.h =================================================================== --- trunk/src/netlist.h (revision 4527) +++ trunk/src/netlist.h (revision 4528) @@ -93,4 +93,19 @@ void FreeNetListMemory(NetListTypePtr); void FreeNetMemory(NetTypePtr); +#define NETLIST_LOOP(top) do { \ + pcb_cardinal_t n; \ + NetListTypePtr netlist; \ + for (n = (top)->NetListN-1; n != -1; n--) \ + { \ + netlist = &(top)->NetList[n] + +#define NET_LOOP(top) do { \ + pcb_cardinal_t n; \ + NetTypePtr net; \ + for (n = (top)->NetN-1; n != -1; n--) \ + { \ + net = &(top)->Net[n] + + #endif Index: trunk/src/rats.h =================================================================== --- trunk/src/rats.h (revision 4527) +++ trunk/src/rats.h (revision 4528) @@ -57,4 +57,17 @@ NetListListType CollectSubnets(pcb_bool); ConnectionTypePtr GetConnectionMemory(NetTypePtr); +#define CONNECTION_LOOP(net) do { \ + pcb_cardinal_t n; \ + ConnectionTypePtr connection; \ + for (n = (net)->ConnectionN-1; n != -1; n--) \ + { \ + connection = & (net)->Connection[n] + +#define RAT_LOOP(top) do { \ + RatType *line; \ + gdl_iterator_t __it__; \ + ratlist_foreach(&(top)->Rat, &__it__, line) { + + #endif Index: trunk/src/remove.c =================================================================== --- trunk/src/remove.c (revision 4527) +++ trunk/src/remove.c (revision 4528) @@ -34,6 +34,7 @@ #include "board.h" #include "data.h" +#include "rats.h" #include "draw.h" #include "misc.h" #include "move.h" Index: trunk/src/search.h =================================================================== --- trunk/src/search.h (revision 4527) +++ trunk/src/search.h (revision 4528) @@ -30,6 +30,7 @@ #define PCB_SEARCH_H #include "global_objs.h" +#include "rats.h" #include "misc_util.h" int lines_intersect(Coord ax1, Coord ay1, Coord ax2, Coord ay2, Coord bx1, Coord by1, Coord bx2, Coord by2); Index: trunk/src_plugins/boardflip/boardflip.c =================================================================== --- trunk/src_plugins/boardflip/boardflip.c (revision 4527) +++ trunk/src_plugins/boardflip/boardflip.c (revision 4528) @@ -30,6 +30,7 @@ #include "config.h" #include "config.h" #include "board.h" +#include "rats.h" #include "data.h" #include "hid.h" #include "misc.h"