Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 3382) +++ trunk/src/Makefile.dep (revision 3383) @@ -1,7 +1,7 @@ ### Generated file, do not edit, run make dep ### ../src_plugins/autoplace/action.o: ../src_plugins/autoplace/action.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -14,7 +14,7 @@ plugins.h set.h global.h hid_actions.h dolists.h ../src_plugins/autoplace/autoplace.o: \ ../src_plugins/autoplace/autoplace.c ../config.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -29,7 +29,7 @@ ../src_3rd/genvector/gds_char.h mymem.h move.h mymem.h rats.h remove.h \ rotate.h ../src_plugins/autoroute/action.o: ../src_plugins/autoroute/action.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -42,9 +42,9 @@ action_helper.h global.h plugins.h set.h hid_actions.h dolists.h ../src_plugins/autoroute/autoroute.o: \ ../src_plugins/autoroute/autoroute.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -62,7 +62,7 @@ mymem.h polygon.h rtree.h rats.h remove.h thermal.h undo.h pcb-printf.h \ set.h layer.h ../src_plugins/autoroute/mtspace.o: ../src_plugins/autoroute/mtspace.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -75,7 +75,7 @@ rtree.h ../src_plugins/autoroute/mtspace.h \ ../src_plugins/autoroute/vector.h ../src_plugins/autoroute/vector.o: ../src_plugins/autoroute/vector.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -86,7 +86,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h ../src_plugins/autoroute/vector.h ../src_plugins/dbus/dbus-pcbmain.o: ../src_plugins/dbus/dbus-pcbmain.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -98,7 +98,7 @@ ../src_3rd/liblihata/genht/hash.h ../src_plugins/dbus/dbus-pcbmain.h ../src_plugins/dbus/dbus.o: ../src_plugins/dbus/dbus.c \ ../src_plugins/dbus/dbus-pcbmain.h ../src_plugins/dbus/dbus-introspect.h \ - global.h ../config.h const.h macro.h global_typedefs.h unit.h \ + global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -110,9 +110,9 @@ ../src_3rd/liblihata/genht/hash.h data.h global.h plugins.h \ hid_actions.h event.h compat_misc.h compat_lrealpath.h dolists.h ../src_plugins/debug/debug.o: ../src_plugins/debug/debug.c ../config.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -127,9 +127,9 @@ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/genvector/vtp0.h list_conf.h conf.h error.h dolists.h ../src_plugins/debug/debug_conf.o: ../src_plugins/debug/debug_conf.c \ - conf.h global.h ../config.h const.h macro.h global_typedefs.h unit.h \ - global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf.h global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h \ + unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ + polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -143,9 +143,9 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ conf.h ../src_plugins/djopt/djopt.o: ../src_plugins/djopt/djopt.c ../config.h \ - conf_core.h conf.h global.h const.h macro.h global_typedefs.h unit.h \ - global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h conf.h global.h const.h macro.h global_typedefs.h pcb_bool.h \ + unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ + polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -163,12 +163,12 @@ ../src_plugins/djopt/djopt_conf_fields.h ../src_plugins/export_bom/bom.o: ../src_plugins/export_bom/bom.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -192,12 +192,12 @@ ../src_plugins/export_gcode/decompose.h ../src_plugins/export_gcode/gcode.o: ../src_plugins/export_gcode/gcode.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -216,7 +216,7 @@ ../src_plugins/export_gcode/decompose.h pcb-printf.h hid_init.h \ hid_attrib.h hid_flags.h hid_color.h dolists.h ../src_plugins/export_gcode/trace.o: ../src_plugins/export_gcode/trace.c \ - global.h ../config.h const.h macro.h global_typedefs.h unit.h \ + global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -232,7 +232,7 @@ ../src_plugins/export_gcode/lists.h ../src_plugins/export_gcode/trace.h ../src_plugins/export_gerber/gerber.o: \ ../src_plugins/export_gerber/gerber.c ../config.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -250,7 +250,7 @@ ../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 ../src_plugins/export_lpr/lpr.o: ../src_plugins/export_lpr/lpr.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -264,7 +264,7 @@ ../src_plugins/export_lpr/../export_ps/ps.h hid_nogui.h hid_init.h \ hid_attrib.h hid_actions.h ../src_plugins/export_nelma/nelma.o: ../src_plugins/export_nelma/nelma.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -279,12 +279,12 @@ hid_color.h dolists.h ../src_plugins/export_png/png.o: ../src_plugins/export_png/png.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -299,12 +299,12 @@ hid_helper.h hid_flags.h dolists.h ../src_plugins/export_ps/eps.o: ../src_plugins/export_ps/eps.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -317,9 +317,9 @@ hid_draw_helpers.h ../src_plugins/export_ps/ps.h hid_init.h hid_attrib.h \ hid_helper.h hid_flags.h hid_color.h ../src_plugins/export_ps/ps.o: ../src_plugins/export_ps/ps.c ../config.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -337,9 +337,9 @@ ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h dolists.h ../src_plugins/export_test/export_test.o: \ ../src_plugins/export_test/export_test.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -355,12 +355,12 @@ hid_nogui.h hid_attrib.h hid_helper.h hid_init.h ../src_plugins/fontmode/fontmode.o: ../src_plugins/fontmode/fontmode.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -373,9 +373,9 @@ rtree.h strflags.h undo.h pcb-printf.h plugins.h hid_actions.h \ compat_misc.h dolists.h ../src_plugins/fp_fs/fp_fs.o: ../src_plugins/fp_fs/fp_fs.c ../config.h \ - mymem.h global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + mymem.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -390,7 +390,7 @@ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/genvector/vtp0.h list_conf.h conf.h conf_core.h compat_inc.h ../src_plugins/fp_wget/fp_wget.o: ../src_plugins/fp_wget/fp_wget.c \ - global.h ../config.h const.h macro.h global_typedefs.h unit.h \ + global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -407,13 +407,14 @@ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/genht/htsp.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ - vtroutestyle.h global_element.h list_element.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h ../src_plugins/fp_wget/wget_common.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h hid.h error.h vtroutestyle.h global_element.h list_element.h \ + ht_element.h ../src_3rd/liblihata/genht/ht.h \ + ../src_plugins/fp_wget/wget_common.h \ ../src_plugins/fp_wget/gedasymbols.h plug_footprint.h vtlibrary.h \ plugins.h compat_misc.h ../src_plugins/fp_wget/wget_common.o: \ @@ -420,7 +421,7 @@ ../src_plugins/fp_wget/wget_common.c \ ../src_plugins/fp_wget/wget_common.h ../src_plugins/hid_batch/batch.o: ../src_plugins/hid_batch/batch.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -436,7 +437,7 @@ ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.o: \ ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.c \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -463,7 +464,7 @@ ../src_plugins/hid_gtk/ghid-coord-entry.o: \ ../src_plugins/hid_gtk/ghid-coord-entry.c \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -489,7 +490,7 @@ ../src_plugins/hid_gtk/ghid-layer-selector.o: \ ../src_plugins/hid_gtk/ghid-layer-selector.c \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -519,7 +520,7 @@ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -542,7 +543,7 @@ error.h ../src_plugins/hid_gtk/gschem_accel_label.h ../src_plugins/hid_gtk/ghid-propedit.o: \ ../src_plugins/hid_gtk/ghid-propedit.c ../src_plugins/hid_gtk/gui.h \ - global.h ../config.h const.h macro.h global_typedefs.h unit.h \ + global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -568,7 +569,7 @@ create.h ../src_plugins/hid_gtk/ghid-route-style-selector.o: \ ../src_plugins/hid_gtk/ghid-route-style-selector.c global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -598,7 +599,7 @@ ../src_plugins/hid_gtk/gtk_conf_list.o: \ ../src_plugins/hid_gtk/gtk_conf_list.c \ ../src_plugins/hid_gtk/gtk_conf_list.h conf.h global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -614,7 +615,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ conf.h compat_misc.h ../src_plugins/hid_gtk/gtkhid-gdk.o: ../src_plugins/hid_gtk/gtkhid-gdk.c \ - global.h ../config.h const.h macro.h global_typedefs.h unit.h \ + global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -641,9 +642,9 @@ hid_attrib.h hid_helper.h hid_color.h ../src_plugins/hid_gtk/gtkhid-main.o: \ ../src_plugins/hid_gtk/gtkhid-main.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -671,9 +672,9 @@ ../src_plugins/hid_gtk/hid_gtk_conf_fields.h ../src_plugins/hid_gtk/gui-command-window.o: \ ../src_plugins/hid_gtk/gui-command-window.c ../config.h conf_core.h \ - conf.h global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -696,12 +697,12 @@ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h crosshair.h hid_actions.h ../src_plugins/hid_gtk/gui-config.o: ../src_plugins/hid_gtk/gui-config.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -726,9 +727,9 @@ vtlibrary.h ../src_3rd/liblihata/tree.h ../src_plugins/hid_gtk/gui-dialog-print.o: \ ../src_plugins/hid_gtk/gui-dialog-print.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -752,12 +753,12 @@ hid_init.h misc_util.h ../src_plugins/hid_gtk/gui-dialog.o: ../src_plugins/hid_gtk/gui-dialog.c \ ../config.h compat_misc.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -777,9 +778,9 @@ event.h ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h ../src_plugins/hid_gtk/gui-drc-window.o: \ ../src_plugins/hid_gtk/gui-drc-window.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -806,11 +807,12 @@ ../src_plugins/hid_gtk/gui-keyref-window.o: \ ../src_plugins/hid_gtk/gui-keyref-window.c ../config.h \ ../src_plugins/hid_gtk/gui.h global.h const.h macro.h global_typedefs.h \ - unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ - polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + pcb_bool.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ + globalconst.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -831,9 +833,9 @@ ../src_plugins/hid_gtk/win_place.h ../src_plugins/hid_gtk/gui-library-window.o: \ ../src_plugins/hid_gtk/gui-library-window.c ../config.h conf_core.h \ - conf.h global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -858,9 +860,9 @@ vtlibrary.h ../src_plugins/hid_gtk/gui-library-window.h ../src_plugins/hid_gtk/gui-log-window.o: \ ../src_plugins/hid_gtk/gui-log-window.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -884,12 +886,12 @@ ../src_plugins/hid_gtk/win_place.h pcb-printf.h hid_actions.h ../src_plugins/hid_gtk/gui-misc.o: ../src_plugins/hid_gtk/gui-misc.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -910,9 +912,9 @@ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h ../src_plugins/hid_gtk/gui-netlist-window.o: \ ../src_plugins/hid_gtk/gui-netlist-window.c ../config.h conf_core.h \ - conf.h global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -938,9 +940,9 @@ undo.h hid_actions.h ../src_plugins/hid_gtk/gui-output-events.o: \ ../src_plugins/hid_gtk/gui-output-events.c ../config.h conf_core.h \ - conf.h global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -965,9 +967,9 @@ draw.h error.h layer.h set.h find.h search.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.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -991,9 +993,9 @@ move.h rotate.h ../src_plugins/hid_gtk/gui-pinout-window.o: \ ../src_plugins/hid_gtk/gui-pinout-window.c ../config.h conf_core.h \ - conf.h global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1017,9 +1019,9 @@ ../src_plugins/hid_gtk/win_place.h copy.h draw.h mymem.h move.h rotate.h ../src_plugins/hid_gtk/gui-top-window.o: \ ../src_plugins/hid_gtk/gui-top-window.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1051,12 +1053,12 @@ hid_flags.h route_style.h ../src_plugins/hid_gtk/gui-utils.o: ../src_plugins/hid_gtk/gui-utils.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1077,9 +1079,9 @@ ../src_plugins/hid_gtk/menu_lht.o: ../src_plugins/hid_gtk/menu_lht.c ../src_plugins/hid_gtk/win_place.o: ../src_plugins/hid_gtk/win_place.c \ ../src_plugins/hid_gtk/win_place.h ../src_plugins/hid_gtk/gui.h global.h \ - ../config.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1101,10 +1103,11 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ event.h compat_misc.h ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h ../src_plugins/hid_lesstif/dialogs.o: \ - ../src_plugins/hid_lesstif/dialogs.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_plugins/hid_lesstif/dialogs.c \ + ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1116,16 +1119,16 @@ ../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 \ - ../src_plugins/hid_lesstif/xincludes.h compat_misc.h global.h data.h \ - crosshair.h layer.h misc.h mymem.h pcb-printf.h hid.h \ - ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \ + compat_misc.h global.h data.h crosshair.h layer.h misc.h mymem.h \ + pcb-printf.h hid.h ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \ ../src_3rd/liblihata/genht/htip.h hid_cfg.h hid_attrib.h hid_actions.h \ hid_init.h ../src_plugins/hid_lesstif/stdarg.h misc_util.h ../src_plugins/hid_lesstif/library.o: \ - ../src_plugins/hid_lesstif/library.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_plugins/hid_lesstif/library.c \ + ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1137,19 +1140,18 @@ ../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 \ - ../src_plugins/hid_lesstif/xincludes.h compat_misc.h global.h data.h \ - misc.h mymem.h set.h buffer.h vtptr.h plug_footprint.h vtlibrary.h hid.h \ - ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ + compat_misc.h global.h data.h misc.h mymem.h set.h buffer.h vtptr.h \ + plug_footprint.h vtlibrary.h hid.h ../src_plugins/hid_lesstif/lesstif.h \ + hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h \ ../src_plugins/hid_lesstif/stdarg.h ../src_plugins/hid_lesstif/main.o: ../src_plugins/hid_lesstif/main.c \ - ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1158,21 +1160,21 @@ ../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 \ - ../src_plugins/hid_lesstif/xincludes.h global.h data.h action_helper.h \ - crosshair.h layer.h mymem.h misc.h mymem.h pcb-printf.h clip.h event.h \ - error.h plugins.h hid.h hid_nogui.h hid_draw_helpers.h hid_cfg.h \ - ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h hid_attrib.h hid_helper.h \ - hid_init.h hid_color.h hid_extents.h hid_flags.h hid_actions.h \ - ../src_plugins/hid_lesstif/stdarg.h misc_util.h compat_misc.h dolists.h + global.h data.h action_helper.h crosshair.h layer.h mymem.h misc.h \ + mymem.h pcb-printf.h clip.h event.h error.h plugins.h hid.h hid_nogui.h \ + hid_draw_helpers.h hid_cfg.h ../src_plugins/hid_lesstif/lesstif.h \ + hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h hid_cfg.h hid_attrib.h \ + hid_helper.h hid_init.h hid_color.h hid_extents.h hid_flags.h \ + hid_actions.h ../src_plugins/hid_lesstif/stdarg.h misc_util.h \ + compat_misc.h dolists.h ../src_plugins/hid_lesstif/menu.o: ../src_plugins/hid_lesstif/menu.c \ - ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1181,17 +1183,17 @@ ../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 \ - ../src_plugins/hid_lesstif/xincludes.h global.h data.h error.h misc.h \ - mymem.h pcb-printf.h layer.h hid.h hid_cfg.h hid_cfg_action.h hid_cfg.h \ - hid_cfg_input.h ../src_3rd/liblihata/genht/htip.h \ - ../src_plugins/hid_lesstif/lesstif.h mymem.h paths.h hid_actions.h \ - hid_flags.h ../src_plugins/hid_lesstif/stdarg.h compat_misc.h + global.h data.h error.h misc.h mymem.h pcb-printf.h layer.h hid.h \ + hid_cfg.h hid_cfg_action.h hid_cfg.h hid_cfg_input.h \ + ../src_3rd/liblihata/genht/htip.h ../src_plugins/hid_lesstif/lesstif.h \ + mymem.h paths.h hid_actions.h hid_flags.h \ + ../src_plugins/hid_lesstif/stdarg.h compat_misc.h ../src_plugins/hid_lesstif/menu_lht.o: \ ../src_plugins/hid_lesstif/menu_lht.c ../src_plugins/hid_lesstif/netlist.o: \ ../src_plugins/hid_lesstif/netlist.c ../config.h \ ../src_plugins/hid_lesstif/xincludes.h compat_misc.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1211,13 +1213,13 @@ ../src_plugins/hid_lesstif/stdarg.h \ ../src_plugins/hid_lesstif/xincludes.h ../src_plugins/hid_lesstif/styles.o: ../src_plugins/hid_lesstif/styles.c \ - ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1226,13 +1228,12 @@ ../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 \ - ../src_plugins/hid_lesstif/xincludes.h compat_misc.h global.h data.h \ - set.h misc.h mymem.h mymem.h pcb-printf.h hid.h \ - ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \ + compat_misc.h global.h data.h set.h misc.h mymem.h mymem.h pcb-printf.h \ + hid.h ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \ ../src_3rd/liblihata/genht/htip.h hid_cfg.h hid_flags.h \ ../src_plugins/hid_lesstif/stdarg.h misc_util.h ../src_plugins/import_edif/edif.o: ../src_plugins/import_edif/edif.c \ - global.h ../config.h const.h macro.h global_typedefs.h unit.h \ + global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1245,7 +1246,7 @@ compat_misc.h ../src_plugins/import_edif/import_edif.o: \ ../src_plugins/import_edif/import_edif.c ../config.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1262,7 +1263,7 @@ ../src_3rd/genvector/vtp0.h list_conf.h ../src_plugins/import_netlist/import_netlist.o: \ ../src_plugins/import_netlist/import_netlist.c ../config.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1280,9 +1281,9 @@ error.h misc.h mymem.h data.h rats_patch.h compat_misc.h ../src_plugins/import_sch/import_sch.o: \ ../src_plugins/import_sch/import_sch.c ../config.h conf_core.h conf.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1300,7 +1301,7 @@ ../src_plugins/import_sch/import_sch_conf_fields.h ../src_plugins/io_kicad_legacy/io_kicad_legacy.o: \ ../src_plugins/io_kicad_legacy/io_kicad_legacy.c ../config.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1324,7 +1325,7 @@ ../src_3rd/liblihata/genht/ht_inlines.h compat_misc.h ../config.h ../src_plugins/io_kicad_legacy/write.o: \ ../src_plugins/io_kicad_legacy/write.c plug_io.h global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1342,7 +1343,7 @@ ../src_3rd/liblihata/genht/htsp.h data.h \ ../src_plugins/io_kicad_legacy/write.h global.h ../src_plugins/io_lihata/common.o: ../src_plugins/io_lihata/common.c \ - global.h ../config.h const.h macro.h global_typedefs.h unit.h \ + global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1355,7 +1356,7 @@ ../src_plugins/io_lihata/common.h ../src_plugins/io_lihata/io_lihata.o: \ ../src_plugins/io_lihata/io_lihata.c ../config.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1376,7 +1377,7 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/ht_inlines.h global.h ../config.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1395,7 +1396,7 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/ht_inlines.h global.h ../config.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1409,7 +1410,7 @@ ../src_3rd/genvector/vtp0.h list_conf.h strflags.h compat_misc.h macro.h \ layer.h ../src_plugins/io_lihata/common.h ../src_plugins/io_pcb/attribs.o: ../src_plugins/io_pcb/attribs.c conf.h \ - global.h ../config.h const.h macro.h global_typedefs.h unit.h \ + global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1425,9 +1426,9 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ conf.h misc.h mymem.h compat_misc.h ../src_plugins/io_pcb/file.o: ../src_plugins/io_pcb/file.c ../config.h \ - conf_core.h conf.h global.h const.h macro.h global_typedefs.h unit.h \ - global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + conf_core.h conf.h global.h const.h macro.h global_typedefs.h pcb_bool.h \ + unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ + polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1447,10 +1448,10 @@ ../src_plugins/io_pcb/attribs.h route_style.h ../src_plugins/io_pcb/flags.o: ../src_plugins/io_pcb/flags.c strflags.h \ global_objs.h ../src_3rd/genlist/gendlist.h ../config.h globalconst.h \ - global_typedefs.h unit.h polyarea.h ../src_plugins/io_pcb/flags.h \ - const.h macro.h + global_typedefs.h pcb_bool.h unit.h polyarea.h \ + ../src_plugins/io_pcb/flags.h const.h macro.h ../src_plugins/io_pcb/io_pcb.o: ../src_plugins/io_pcb/io_pcb.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1468,12 +1469,12 @@ ../src_plugins/io_pcb/file.h ../src_plugins/io_pcb/parse_l.o: ../src_plugins/io_pcb/parse_l.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1489,12 +1490,12 @@ compat_misc.h ../src_plugins/io_pcb/parse_y.o: ../src_plugins/io_pcb/parse_y.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1512,7 +1513,7 @@ ../src_plugins/legacy_func/legacy_func.c ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h ../config.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1523,7 +1524,7 @@ ../src_3rd/liblihata/genht/hash.h data.h global.h action_helper.h \ change.h error.h undo.h plugins.h ../src_plugins/loghid/loghid.o: ../src_plugins/loghid/loghid.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1547,7 +1548,7 @@ ../src_plugins/mincut/pcb-mincut/solve.h \ ../src_plugins/mincut/pcb-mincut/graph.h compat_misc.h ../config.h ../src_plugins/mincut/rats_mincut.o: ../src_plugins/mincut/rats_mincut.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1570,7 +1571,7 @@ ../src_plugins/mincut/rats_mincut_conf_fields.h ../src_plugins/oldactions/oldactions.o: \ ../src_plugins/oldactions/oldactions.c ../config.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1588,7 +1589,7 @@ hid_actions.h dolists.h ../src_plugins/propedit/propedit.o: ../src_plugins/propedit/propedit.c \ plugins.h ../src_plugins/propedit/props.h global.h ../config.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1603,12 +1604,12 @@ dolists.h ../src_plugins/propedit/props.o: ../src_plugins/propedit/props.c \ ../src_plugins/propedit/props.h global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1616,9 +1617,9 @@ ../src_3rd/liblihata/genht/ht.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/genht/ht.c ../src_plugins/propedit/propsel.o: ../src_plugins/propedit/propsel.c \ - data.h global.h ../config.h const.h macro.h global_typedefs.h unit.h \ - global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + data.h global.h ../config.h const.h macro.h global_typedefs.h pcb_bool.h \ + unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ + polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1630,12 +1631,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_plugins/propedit/propsel.h ../src_plugins/puller/puller.o: ../src_plugins/puller/puller.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1648,7 +1649,7 @@ remove.h rtree.h strflags.h undo.h layer.h plugins.h hid_actions.h \ misc_util.h dolists.h ../src_plugins/renumber/renumber.o: ../src_plugins/renumber/renumber.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1667,12 +1668,12 @@ dolists.h ../src_plugins/report/report.o: ../src_plugins/report/report.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1690,12 +1691,12 @@ ../src_plugins/report/report_conf_fields.h ../src_plugins/shand_cmd/command.o: ../src_plugins/shand_cmd/command.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1708,7 +1709,7 @@ data.h error.h plug_io.h mymem.h misc.h mymem.h rats.h set.h plugins.h \ hid_actions.h compat_misc.h dolists.h ../src_plugins/stroke/stroke.o: ../src_plugins/stroke/stroke.c \ - ../config.h global.h const.h macro.h global_typedefs.h unit.h \ + ../config.h global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1727,7 +1728,7 @@ ../src_plugins/toporouter/toporouter.o: \ ../src_plugins/toporouter/toporouter.c \ ../src_plugins/toporouter/toporouter.h data.h global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1743,12 +1744,12 @@ remove.h thermal.h undo.h ../src_3rd/gts/gts.h pcb-printf.h ../src_plugins/vendordrill/vendor.o: ../src_plugins/vendordrill/vendor.c \ ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -1847,7 +1848,7 @@ ../src_3rd/liblihata/dom_internal.h ../src_3rd/liblihata/tree.h \ ../src_3rd/liblihata/dom.h action_act.o: action_act.c ../config.h error.h action_helper.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1858,7 +1859,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h hid_actions.h undo.h action_helper.o: action_helper.c ../config.h conf_core.h conf.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1878,7 +1879,7 @@ set.h undo.h stub_stroke.h funchash_core.h funchash.h \ funchash_core_list.h hid_actions.h compat_misc.h layer.h buffer.o: buffer.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1898,7 +1899,7 @@ compat_misc.h layer.h buildin.o: buildin.c plugins.h buildin.h change.o: change.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1915,7 +1916,7 @@ crosshair.h data.h draw.h misc.h mymem.h mirror.h polygon.h rtree.h \ select.h undo.h hid_actions.h layer.h change_act.o: change_act.c ../config.h conf_core.h conf.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1933,18 +1934,18 @@ hid_actions.h change.h draw.h search.h misc_util.h misc.h mymem.h set.h \ undo.h rubberband.h compat_misc.h layer.h clip.o: clip.c ../config.h clip.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 compat_dl.o: compat_dl.c ../config.h compat_dl.h compat_inc.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1958,20 +1959,21 @@ compat_misc.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ - vtroutestyle.h global_element.h list_element.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h hid.h error.h vtroutestyle.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 mymem.h compat_lrealpath.o: compat_lrealpath.c ../config.h compat_lrealpath.h \ compat_misc.h compat_misc.o: compat_misc.c ../config.h compat_misc.h compat_inc.h \ - global.h const.h macro.h global_typedefs.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ - list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + global.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ + list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -1984,7 +1986,7 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/ht_inlines.h conf.h global.h ../config.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -1998,12 +2000,12 @@ hid_init.h hid_attrib.h misc_util.h paths.h compat_fs.h compat_misc.h \ ../src_3rd/genvector/genvector_impl.c conf_act.o: conf_act.c global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2014,12 +2016,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ conf_core.h misc.h mymem.h misc_util.h route_style.h conf_core.o: conf_core.c conf.h global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2030,7 +2032,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ conf_core.h conf_core_fields.h conf_hid.o: conf_hid.c conf_hid.h conf.h global.h ../config.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2047,12 +2049,12 @@ ../src_3rd/liblihata/genht/htpp.h conf_core.h conf_internal.o: conf_internal.c copy.o: copy.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2064,7 +2066,7 @@ create.h data.h draw.h misc.h mymem.h layer.h move.h polygon.h rtree.h \ select.h undo.h compat_misc.h create.o: create.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2081,7 +2083,7 @@ create.h data.h misc.h mymem.h layer.h rtree.h search.h misc_util.h \ undo.h plug_io.h stub_vendor.h hid_actions.h paths.h compat_misc.h crosshair.o: crosshair.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2098,23 +2100,23 @@ box.h misc_util.h crosshair.h data.h draw.h line.h rtree.h search.h \ polygon.h misc.h mymem.h hid_actions.h layer.h compat_misc.h data.o: data.c ../config.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 draw.o: draw.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2126,12 +2128,12 @@ data.h draw.h misc.h mymem.h rotate.h rtree.h draw_fab.h hid_helper.h \ layer.h draw_fab.o: draw_fab.c ../config.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2139,7 +2141,18 @@ ../src_3rd/genvector/gds_char.h mymem.h draw_fab.h polygon.h rtree.h \ layer.h drill.o: drill.c ../config.h mymem.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 +error.o: error.c ../config.h global.h const.h macro.h global_typedefs.h \ + pcb_bool.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ globalconst.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -2148,16 +2161,6 @@ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 -error.o: error.c ../config.h global.h const.h macro.h global_typedefs.h \ - unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ - polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 data.h plug_io.h conf.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ @@ -2166,7 +2169,7 @@ compat_misc.h event.o: event.c event.h error.h file_act.o: file_act.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2184,12 +2187,12 @@ buffer.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 find.o: find.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2203,7 +2206,7 @@ layer.h find_geo.c find_lookup.c find_drc.c find_misc.c find_debug.c \ find_print.c find_act.o: find_act.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2224,7 +2227,7 @@ ../src_3rd/liblihata/genht/hash.h funchash_core.h funchash.h \ funchash_core_list.h macro.h gui_act.o: gui_act.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2243,18 +2246,18 @@ set.h misc.h mymem.h stub_stroke.h hid_actions.h hid_init.h \ route_style.h layer.h heap.o: heap.c ../config.h heap.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 hid_actions.o: hid_actions.c ../config.h conf_core.h conf.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2270,12 +2273,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/liblihata/genht/htsp.h event.h hid_actions.h compat_misc.h hid_attrib.o: hid_attrib.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2287,7 +2290,7 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/ht_inlines.h global.h ../config.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2298,12 +2301,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ hid_cfg.h paths.h compat_misc.h hid_cfg_action.o: hid_cfg_action.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2319,7 +2322,7 @@ ../src_3rd/liblihata/genht/hash.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global.h ../config.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2328,12 +2331,12 @@ ht_element.h ../src_3rd/liblihata/genht/ht.h hid_cfg.h hid_cfg_input.h \ ../src_3rd/liblihata/genht/htip.h hid_actions.h hid_cfg_action.h hid_color.o: hid_color.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2340,7 +2343,7 @@ ../src_3rd/liblihata/genht/hash.h hid_color.h compat_misc.h \ ../src_3rd/liblihata/genht/ht.c hid_draw_helpers.o: hid_draw_helpers.c global.h ../config.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2351,12 +2354,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h polygon.h rtree.h hid_extents.o: hid_extents.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2363,12 +2366,12 @@ ../src_3rd/liblihata/genht/hash.h data.h layer.h hid_draw_helpers.h \ hid_helper.h hid_flags.o: hid_flags.c ../config.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2379,12 +2382,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ hid_flags.h ../src_3rd/liblihata/genht/htsp.h hid_actions.h hid_helper.o: hid_helper.c ../config.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2391,12 +2394,12 @@ ../src_3rd/liblihata/genht/hash.h misc.h ../src_3rd/genvector/gds_char.h \ mymem.h layer.h hid_helper.h hid_attrib.h compat_misc.h hid_init.o: hid_init.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2408,29 +2411,29 @@ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h hid_nogui.o: hid_nogui.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 compat_misc.h ht_element.o: ht_element.c global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 ../src_3rd/liblihata/genht/ht.c insert.o: insert.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2447,7 +2450,18 @@ create.h crosshair.h data.h draw.h line.h misc.h mymem.h polygon.h \ rtree.h search.h misc_util.h select.h set.h undo.h layer.h intersect.o: intersect.c ../config.h intersect.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 +layer.o: layer.c global.h ../config.h const.h macro.h global_typedefs.h \ + pcb_bool.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ globalconst.h polyarea.h list_common.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -2456,16 +2470,6 @@ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 -layer.o: layer.c global.h ../config.h const.h macro.h global_typedefs.h \ - unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ - polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 data.h conf_core.h conf.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ @@ -2473,12 +2477,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ layer.h hid_actions.h compat_misc.h line.o: line.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2489,16 +2493,17 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ data.h crosshair.h find.h line.h misc.h mymem.h rtree.h layer.h list_arc.o: list_arc.c global_objs.h ../src_3rd/genlist/gendlist.h \ - ../config.h globalconst.h global_typedefs.h unit.h polyarea.h list_arc.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c + ../config.h globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h \ + list_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + ../src_3rd/genlist/gentdlist_impl.c list_conf.o: list_conf.c conf.h global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2509,50 +2514,53 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_impl.c list_element.o: list_element.c global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 ../src_3rd/genlist/gentdlist_impl.c list_line.o: list_line.c global_objs.h ../src_3rd/genlist/gendlist.h \ - ../config.h globalconst.h global_typedefs.h unit.h polyarea.h \ + ../config.h globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ ../src_3rd/genlist/gentdlist_impl.c list_pad.o: list_pad.c global_objs.h ../src_3rd/genlist/gendlist.h \ - ../config.h globalconst.h global_typedefs.h unit.h polyarea.h list_pad.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c + ../config.h globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h \ + list_pad.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + ../src_3rd/genlist/gentdlist_impl.c list_pin.o: list_pin.c global_objs.h ../src_3rd/genlist/gendlist.h \ - ../config.h globalconst.h global_typedefs.h unit.h polyarea.h list_pin.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c + ../config.h globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h \ + list_pin.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + ../src_3rd/genlist/gentdlist_impl.c list_poly.o: list_poly.c global_objs.h ../src_3rd/genlist/gendlist.h \ - ../config.h globalconst.h global_typedefs.h unit.h polyarea.h \ + ../config.h globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h \ list_poly.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ ../src_3rd/genlist/gentdlist_impl.c list_rat.o: list_rat.c global_objs.h ../src_3rd/genlist/gendlist.h \ - ../config.h globalconst.h global_typedefs.h unit.h polyarea.h list_rat.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c + ../config.h globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h \ + list_rat.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + ../src_3rd/genlist/gentdlist_impl.c list_text.o: list_text.c global_objs.h ../src_3rd/genlist/gendlist.h \ - ../config.h globalconst.h global_typedefs.h unit.h polyarea.h \ + ../config.h globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h \ list_text.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ ../src_3rd/genlist/gentdlist_impl.c main.o: main.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2567,7 +2575,7 @@ funchash.h hid_actions.h hid_attrib.h hid_init.h compat_misc.h dolists.h \ generated_lists.h main_act.o: main_act.c ../config.h action_helper.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2583,12 +2591,12 @@ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/genvector/vtp0.h list_conf.h mirror.o: mirror.c ../config.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2595,12 +2603,12 @@ ../src_3rd/liblihata/genht/hash.h mirror.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h polygon.h rtree.h misc.o: misc.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2612,14 +2620,14 @@ box.h misc_util.h crosshair.h data.h plug_io.h misc.h mymem.h move.h \ polygon.h rtree.h rotate.h rubberband.h set.h undo.h compat_misc.h \ hid_actions.h hid_init.h -misc_util.o: misc_util.c ../config.h misc_util.h unit.h +misc_util.o: misc_util.c ../config.h misc_util.h pcb_bool.h unit.h move.o: move.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2631,12 +2639,12 @@ create.h data.h draw.h misc.h mymem.h move.h polygon.h rtree.h search.h \ misc_util.h select.h undo.h hid_actions.h compat_misc.h layer.h mymem.o: mymem.c ../config.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2643,9 +2651,9 @@ ../src_3rd/liblihata/genht/hash.h mymem.h rtree.h rats_patch.h netlist.o: netlist.c ../config.h ../src_3rd/genregex/regex_sei.h \ ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h \ - action_helper.h global.h const.h macro.h global_typedefs.h unit.h \ - global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h \ - list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + action_helper.h global.h const.h macro.h global_typedefs.h pcb_bool.h \ + unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ + polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ @@ -2659,7 +2667,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ find.h mymem.h rats.h create.h rats_patch.h hid_actions.h compat_misc.h object_act.o: object_act.c ../config.h conf_core.h conf.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2678,7 +2686,7 @@ rotate.h set.h copy.h misc.h mymem.h rubberband.h buffer.h remove.h \ create.h compat_misc.h layer.h paths.o: paths.c ../config.h paths.h error.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2694,12 +2702,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ conf_core.h pcb-printf.o: pcb-printf.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2707,7 +2715,7 @@ ../src_3rd/genvector/gds_char.h plug_footprint.o: plug_footprint.c ../config.h plug_footprint.h \ vtlibrary.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ - global_typedefs.h unit.h polyarea.h \ + global_typedefs.h pcb_bool.h unit.h polyarea.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h plugins.h \ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ @@ -2723,7 +2731,7 @@ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h plug_footprint_act.o: plug_footprint_act.c ../config.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2734,7 +2742,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h plug_footprint.h vtlibrary.h plug_import.o: plug_import.c ../config.h conf_core.h conf.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2750,7 +2758,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ plugins.h plug_import.h plug_io.o: plug_io.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2768,12 +2776,12 @@ set.h paths.h rats_patch.h hid_actions.h hid_flags.h plugins.h event.h \ compat_misc.h route_style.h compat_inc.h plugins.o: plugins.c plugins.h global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2780,7 +2788,7 @@ ../src_3rd/liblihata/genht/hash.h ../src_3rd/genvector/gds_char.h \ compat_misc.h polygon.o: polygon.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2797,12 +2805,12 @@ box.h misc_util.h create.h crosshair.h data.h draw.h polygon.h rtree.h \ remove.h search.h set.h thermal.h mymem.h undo.h misc.h layer.h polygon1.o: polygon1.c rtree.h global.h ../config.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2809,7 +2817,7 @@ ../src_3rd/liblihata/genht/hash.h heap.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h polygon_act.o: polygon_act.c ../config.h conf_core.h conf.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2827,12 +2835,12 @@ funchash_core_list.h polygon.h rtree.h draw.h search.h misc_util.h \ crosshair.h rats.o: rats.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2845,7 +2853,7 @@ rats.h search.h misc_util.h undo.h stub_mincut.h route_style.h \ compat_misc.h rats_act.o: rats_act.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2862,7 +2870,7 @@ data.h action_helper.h undo.h set.h misc.h mymem.h find.h remove.h \ funchash_core.h funchash.h funchash_core_list.h rats.h draw.h rats_patch.o: rats_patch.c rats_patch.h global.h ../config.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2875,7 +2883,7 @@ ../src_3rd/liblihata/genht/ht.h create.h data.h buffer.h remove.h copy.h \ compat_misc.h remove.o: remove.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2892,12 +2900,12 @@ data.h draw.h misc.h mymem.h move.h polygon.h rtree.h remove.h select.h \ undo.h remove_act.o: remove_act.c ../config.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2904,12 +2912,12 @@ ../src_3rd/liblihata/genht/hash.h action_helper.h set.h remove.h \ funchash_core.h funchash.h funchash_core_list.h rotate.o: rotate.c ../config.h data.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2921,12 +2929,12 @@ ../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 route_style.o: route_style.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2937,23 +2945,23 @@ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/genvector/vtp0.h list_conf.h rtree.o: rtree.c ../config.h rtree.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 rubberband.o: rubberband.c ../config.h create.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -2960,7 +2968,7 @@ ../src_3rd/liblihata/genht/hash.h data.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h layer.h polygon.h rtree.h search.o: search.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2977,7 +2985,7 @@ box.h misc_util.h data.h find.h polygon.h rtree.h search.h misc.h \ mymem.h layer.h select.o: select.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -2995,7 +3003,7 @@ find.h layer.h compat_misc.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 conf_core.h conf.h global.h \ - const.h macro.h global_typedefs.h unit.h global_objs.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -3013,12 +3021,12 @@ funchash_core_list.h select.h crosshair.h set.h buffer.h draw.h remove.h \ copy.h hid_attrib.h compat_misc.h set.o: set.c ../config.h conf_core.h conf.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -3030,30 +3038,30 @@ action_helper.h buffer.h crosshair.h data.h draw.h find.h set.h undo.h \ hid_actions.h route_style.h strflags.o: strflags.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 strflags.h compat_misc.h stub_mincut.o: stub_mincut.c ../config.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.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 stub_mincut.h -stub_stroke.o: stub_stroke.c error.h +stub_stroke.o: stub_stroke.c error.h pcb_bool.h stub_vendor.o: stub_vendor.c stub_vendor.h ../config.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -3064,12 +3072,12 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h thermal.o: thermal.c ../config.h misc.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -3076,12 +3084,12 @@ ../src_3rd/liblihata/genht/hash.h ../src_3rd/genvector/gds_char.h \ mymem.h polygon.h rtree.h thermal.h undo.o: undo.c ../config.h buffer.h global.h const.h macro.h \ - global_typedefs.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ - globalconst.h polyarea.h list_common.h list_line.h \ - ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ - ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ - list_pad.h list_pin.h list_rat.h vtonpoint.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ + list_line.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ + vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -3094,7 +3102,7 @@ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h undo_act.o: undo_act.c ../config.h conf_core.h conf.h global.h const.h \ - macro.h global_typedefs.h unit.h global_objs.h \ + macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \ list_line.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ @@ -3112,11 +3120,12 @@ crosshair.h undo.h polygon.h rtree.h set.h search.h misc_util.h draw.h \ misc.h mymem.h layer.h unit.o: unit.c ../config.h global.h const.h macro.h global_typedefs.h \ - unit.h global_objs.h ../src_3rd/genlist/gendlist.h globalconst.h \ - polyarea.h list_common.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ - list_arc.h list_text.h list_poly.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h ../src_3rd/genvector/genvector_impl.h \ + pcb_bool.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h \ + globalconst.h polyarea.h list_common.h list_line.h \ + ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ + ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ + list_pad.h list_pin.h list_rat.h vtonpoint.h \ + ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h hid.h error.h vtroutestyle.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ @@ -3123,18 +3132,18 @@ ../src_3rd/liblihata/genht/hash.h vtlibrary.o: vtlibrary.c vtlibrary.h global_objs.h \ ../src_3rd/genlist/gendlist.h ../config.h globalconst.h \ - global_typedefs.h unit.h polyarea.h \ + global_typedefs.h pcb_bool.h unit.h polyarea.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h \ ../src_3rd/genvector/genvector_impl.c vtonpoint.o: vtonpoint.c vtonpoint.h global_objs.h \ ../src_3rd/genlist/gendlist.h ../config.h globalconst.h \ - global_typedefs.h unit.h polyarea.h \ + global_typedefs.h pcb_bool.h unit.h polyarea.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h \ ../src_3rd/genvector/genvector_impl.c vtptr.o: vtptr.c vtptr.h global_objs.h ../src_3rd/genlist/gendlist.h \ - ../config.h globalconst.h global_typedefs.h unit.h polyarea.h \ + ../config.h globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h \ ../src_3rd/genvector/genvector_impl.c Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 3382) +++ trunk/src/action_helper.c (revision 3383) @@ -151,7 +151,7 @@ static Cardinal polyIndex = 0; -bool saved_mode = false; +pcb_bool saved_mode = pcb_false; /* --------------------------------------------------------------------------- * some local routines @@ -162,7 +162,7 @@ */ void ClearWarnings() { - conf_core.temp.rat_warn = false; + conf_core.temp.rat_warn = pcb_false; ALLPIN_LOOP(PCB->Data); { if (TEST_FLAG(PCB_FLAG_WARN, pin)) { @@ -218,17 +218,17 @@ static void click_cb(hidval hv) { if (Note.Click) { - notify_crosshair_change(false); - Note.Click = false; + notify_crosshair_change(pcb_false); + Note.Click = pcb_false; if (Note.Moving && !gui->shift_is_pressed()) { Note.Buffer = conf_core.editor.buffer_number; SetBufferNumber(MAX_BUFFER - 1); ClearBuffer(PASTEBUFFER); - AddSelectedToBuffer(PASTEBUFFER, Note.X, Note.Y, true); + AddSelectedToBuffer(PASTEBUFFER, Note.X, Note.Y, pcb_true); SaveUndoSerialNumber(); RemoveSelected(); SaveMode(); - saved_mode = true; + saved_mode = pcb_true; SetMode(PCB_MODE_PASTE_BUFFER); } else if (Note.Hit && !gui->shift_is_pressed()) { @@ -235,7 +235,7 @@ BoxType box; SaveMode(); - saved_mode = true; + saved_mode = pcb_true; pcb_trace("click_cb() SetMode, pre %d\n", conf_core.editor.mode); SetMode(gui->control_is_pressed()? PCB_MODE_COPY : PCB_MODE_MOVE); pcb_trace("click_cb() SetMode, post %d\n", conf_core.editor.mode); @@ -262,7 +262,7 @@ BoxType box; Note.Hit = 0; - Note.Moving = false; + Note.Moving = pcb_false; SaveUndoSerialNumber(); box.X1 = -MAX_COORD; box.Y1 = -MAX_COORD; @@ -269,13 +269,13 @@ box.X2 = MAX_COORD; box.Y2 = MAX_COORD; /* unselect first if shift key not down */ - if (!gui->shift_is_pressed() && SelectBlock(&box, false)) - SetChangedFlag(true); + if (!gui->shift_is_pressed() && SelectBlock(&box, pcb_false)) + SetChangedFlag(pcb_true); NotifyBlock(); Crosshair.AttachedBox.Point1.X = Note.X; Crosshair.AttachedBox.Point1.Y = Note.Y; } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); } } @@ -291,12 +291,12 @@ box.X2 = MAX_COORD; box.Y2 = MAX_COORD; - Note.Click = false; /* inhibit timer action */ + Note.Click = pcb_false; /* inhibit timer action */ SaveUndoSerialNumber(); /* unselect first if shift key not down */ if (!gui->shift_is_pressed()) { - if (SelectBlock(&box, false)) - SetChangedFlag(true); + if (SelectBlock(&box, pcb_false)) + SetChangedFlag(pcb_true); if (Note.Moving) { Note.Moving = 0; Note.Hit = 0; @@ -305,7 +305,7 @@ } RestoreUndoSerialNumber(); if (SelectObject()) - SetChangedFlag(true); + SetChangedFlag(pcb_true); Note.Hit = 0; Note.Moving = 0; } @@ -314,7 +314,7 @@ NotifyMode(); ClearBuffer(PASTEBUFFER); SetBufferNumber(Note.Buffer); - Note.Moving = false; + Note.Moving = pcb_false; Note.Hit = 0; } else if (Note.Hit) { @@ -328,8 +328,8 @@ box.Y2 = Crosshair.AttachedBox.Point2.Y; RestoreUndoSerialNumber(); - if (SelectBlock(&box, true)) - SetChangedFlag(true); + if (SelectBlock(&box, pcb_true)) + SetChangedFlag(pcb_true); else if (Bumped) IncrementUndoSerialNumber(); Crosshair.AttachedBox.State = STATE_FIRST; @@ -336,7 +336,7 @@ } if (saved_mode) RestoreMode(); - saved_mode = false; + saved_mode = pcb_false; } /* --------------------------------------------------------------------------- @@ -414,7 +414,7 @@ void *ptr1, *ptr2, *ptr3; if (!Marked.status || conf_core.editor.local_ref) - SetLocalRef(Crosshair.X, Crosshair.Y, true); + SetLocalRef(Crosshair.X, Crosshair.Y, pcb_true); switch (Crosshair.AttachedLine.State) { case STATE_FIRST: /* first point */ if (PCB->RatDraw && SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr1, &ptr1) == PCB_TYPE_NONE) { @@ -423,7 +423,7 @@ } if (conf_core.editor.auto_drc && conf_core.editor.mode == PCB_MODE_LINE) { type = SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3); - LookupConnection(Crosshair.X, Crosshair.Y, true, 1, PCB_FLAG_FOUND); + LookupConnection(Crosshair.X, Crosshair.Y, pcb_true, 1, PCB_FLAG_FOUND); } if (type == PCB_TYPE_PIN || type == PCB_TYPE_VIA) { Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = ((PinTypePtr) ptr2)->X; @@ -466,7 +466,7 @@ */ void NotifyBlock(void) { - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); switch (Crosshair.AttachedBox.State) { case STATE_FIRST: /* setup first point */ Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = Crosshair.X; @@ -478,7 +478,7 @@ Crosshair.AttachedBox.State = STATE_THIRD; break; } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); } @@ -502,7 +502,7 @@ int test; hidval hv; - Note.Click = true; + Note.Click = pcb_true; /* do something after click time */ gui->add_timer(click_cb, conf_core.editor.click_time, hv); @@ -519,7 +519,7 @@ Note.ptr3 = ptr3; } if (!Note.Moving && (type & SELECT_TYPES) && TEST_FLAG(PCB_FLAG_SELECTED, (PinTypePtr) ptr2)) - Note.Moving = true; + Note.Moving = pcb_true; if ((Note.Hit && Note.Moving) || type == PCB_TYPE_NONE) break; } @@ -1010,7 +1010,7 @@ } } if (CopyPastebufferToLayout(Note.X, Note.Y)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); if (e) { int type = SearchScreen(Note.X, Note.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3); @@ -1061,7 +1061,7 @@ } RemoveObject(type, ptr1, ptr2, ptr3); IncrementUndoSerialNumber(); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } break; @@ -1108,9 +1108,9 @@ Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3, Note.X - Crosshair.AttachedObject.X, Note.Y - Crosshair.AttachedObject.Y); - SetLocalRef(0, 0, false); + SetLocalRef(0, 0, pcb_false); } - SetChangedFlag(true); + SetChangedFlag(pcb_true); /* reset identifiers */ Crosshair.AttachedObject.Type = PCB_TYPE_NONE; @@ -1157,12 +1157,12 @@ if (Crosshair.AttachedObject.Type == PCB_TYPE_POLYGON) InsertPointIntoObject(PCB_TYPE_POLYGON, Crosshair.AttachedObject.Ptr1, fake.poly, - &polyIndex, InsertedPoint.X, InsertedPoint.Y, false, false); + &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); else InsertPointIntoObject(Crosshair.AttachedObject.Type, Crosshair.AttachedObject.Ptr1, - Crosshair.AttachedObject.Ptr2, &polyIndex, InsertedPoint.X, InsertedPoint.Y, false, false); - SetChangedFlag(true); + Crosshair.AttachedObject.Ptr2, &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); + SetChangedFlag(pcb_true); /* reset identifiers */ Crosshair.AttachedObject.Type = PCB_TYPE_NONE; @@ -1186,7 +1186,7 @@ if (MoveCrosshairAbsolute(ev_x, ev_y)) { /* update object position and cursor location */ AdjustAttachedObjects(); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); } } Index: trunk/src/action_helper.h =================================================================== --- trunk/src/action_helper.h (revision 3382) +++ trunk/src/action_helper.h (revision 3383) @@ -41,7 +41,7 @@ void warpNoWhere(void); /* In gui-misc.c */ -bool ActionGetLocation(char *); +pcb_bool ActionGetLocation(char *); void ActionGetXY(char *); #define ACTION_ARG(n) (argc > (n) ? argv[n] : NULL) @@ -60,8 +60,8 @@ typedef struct { Coord X, Y; Cardinal Buffer; - bool Click; - bool Moving; /* selected type clicked on */ + pcb_bool Click; + pcb_bool Moving; /* selected type clicked on */ int Hit; /* move type clicked on */ void *ptr1; void *ptr2; @@ -69,7 +69,7 @@ } action_note_t; extern action_note_t Note; -extern bool saved_mode; +extern pcb_bool saved_mode; void ReleaseMode(void); Index: trunk/src/box.h =================================================================== --- trunk/src/box.h (revision 3382) +++ trunk/src/box.h (revision 3383) @@ -92,22 +92,22 @@ /* note that boxes are closed on top and left and open on bottom and right. */ /* this means that top-left corner is in box, *but bottom-right corner is * not*. */ -static inline bool point_in_box(const BoxType * box, Coord X, Coord Y) +static inline pcb_bool point_in_box(const BoxType * box, Coord X, Coord Y) { return (X >= box->X1) && (Y >= box->Y1) && (X < box->X2) && (Y < box->Y2); } -static inline bool point_in_closed_box(const BoxType * box, Coord X, Coord Y) +static inline pcb_bool point_in_closed_box(const BoxType * box, Coord X, Coord Y) { return (X >= box->X1) && (Y >= box->Y1) && (X <= box->X2) && (Y <= box->Y2); } -static inline bool box_is_good(const BoxType * b) +static inline pcb_bool box_is_good(const BoxType * b) { return (b->X1 < b->X2) && (b->Y1 < b->Y2); } -static inline bool box_intersect(const BoxType * a, const BoxType * b) +static inline pcb_bool box_intersect(const BoxType * a, const BoxType * b) { return (a->X1 < b->X2) && (b->X1 < a->X2) && (a->Y1 < b->Y2) && (b->Y1 < a->Y2); } @@ -122,7 +122,7 @@ return r; } -static inline bool box_in_box(const BoxType * outer, const BoxType * inner) +static inline pcb_bool box_in_box(const BoxType * outer, const BoxType * inner) { return (outer->X1 <= inner->X1) && (inner->X2 <= outer->X2) && (outer->Y1 <= inner->Y1) && (inner->Y2 <= outer->Y2); } Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 3382) +++ trunk/src/buffer.c (revision 3383) @@ -187,7 +187,7 @@ ElementTypePtr element; element = GetElementMemory(Dest); - CopyElementLowLevel(Dest, element, Element, false, 0, 0); + CopyElementLowLevel(Dest, element, Element, pcb_false, 0, 0); CLEAR_FLAG(ExtraFlag, element); if (ExtraFlag) { ELEMENTTEXT_LOOP(element); @@ -401,7 +401,7 @@ * copies all selected and visible objects to the paste buffer * returns true if any objects have been removed */ -void AddSelectedToBuffer(BufferTypePtr Buffer, Coord X, Coord Y, bool LeaveSelected) +void AddSelectedToBuffer(BufferTypePtr Buffer, Coord X, Coord Y, pcb_bool LeaveSelected) { /* switch crosshair off because adding objects to the pastebuffer * may change the 'valid' area for the cursor @@ -408,10 +408,10 @@ */ if (!LeaveSelected) ExtraFlag = PCB_FLAG_SELECTED; - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); Source = PCB->Data; Dest = Buffer->Data; - SelectedOperation(&AddBufferFunctions, false, PCB_TYPEMASK_ALL); + SelectedOperation(&AddBufferFunctions, pcb_false, PCB_TYPEMASK_ALL); /* set origin to passed or current position */ if (X || Y) { @@ -422,7 +422,7 @@ Buffer->X = Crosshair.X; Buffer->Y = Crosshair.Y; } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); ExtraFlag = 0; } @@ -429,10 +429,10 @@ /* --------------------------------------------------------------------------- * loads element data from file/library into buffer * parse the file with disabled 'PCB mode' (see parser) - * returns false on error + * returns pcb_false on error * if successful, update some other stuff and reposition the pastebuffer */ -bool LoadElementToBuffer(BufferTypePtr Buffer, const char *Name) +pcb_bool LoadElementToBuffer(BufferTypePtr Buffer, const char *Name) { ElementTypePtr element; @@ -450,12 +450,12 @@ Buffer->X = 0; Buffer->Y = 0; } - return (true); + return (pcb_true); } /* release memory which might have been acquired */ ClearBuffer(Buffer); - return (false); + return (pcb_false); } @@ -526,7 +526,7 @@ * * break buffer element into pieces */ -bool SmashBufferElement(BufferTypePtr Buffer) +pcb_bool SmashBufferElement(BufferTypePtr Buffer) { ElementTypePtr element; Cardinal group; @@ -534,7 +534,7 @@ if (elementlist_length(&Buffer->Data->Element) != 1) { Message(PCB_MSG_DEFAULT, _("Error! Buffer doesn't contain a single element\n")); - return (false); + return (pcb_false); } /* * At this point the buffer should contain just a single element. @@ -588,7 +588,7 @@ END_LOOP; FreeElementMemory(element); RemoveFreeElement(element); - return (true); + return (pcb_true); } /*--------------------------------------------------------------------------- @@ -628,14 +628,14 @@ * * convert buffer contents into an element */ -bool ConvertBufferToElement(BufferTypePtr Buffer) +pcb_bool ConvertBufferToElement(BufferTypePtr Buffer) { ElementTypePtr Element; Cardinal group; Cardinal pin_n = 1; - bool hasParts = false, crooked = false; + pcb_bool hasParts = pcb_false, crooked = pcb_false; int onsolder; - bool warned = false; + pcb_bool warned = pcb_false; if (Buffer->Data->pcb == 0) Buffer->Data->pcb = PCB; @@ -642,9 +642,9 @@ Element = CreateNewElement(PCB->Data, NULL, &PCB->Font, NoFlags(), NULL, NULL, NULL, PASTEBUFFER->X, - PASTEBUFFER->Y, 0, 100, MakeFlags(SWAP_IDENT ? PCB_FLAG_ONSOLDER : PCB_FLAG_NO), false); + PASTEBUFFER->Y, 0, 100, MakeFlags(SWAP_IDENT ? PCB_FLAG_ONSOLDER : PCB_FLAG_NO), pcb_false); if (!Element) - return (false); + return (pcb_false); VIA_LOOP(Buffer->Data); { char num[8]; @@ -660,7 +660,7 @@ via->Clearance, via->Mask, via->DrillingHole, NULL, num, MaskFlags(via->Flags, PCB_FLAG_VIA | PCB_FLAG_FOUND | PCB_FLAG_SELECTED | PCB_FLAG_WARN)); } - hasParts = true; + hasParts = pcb_true; } END_LOOP; @@ -680,7 +680,7 @@ #define MAYBE_WARN() \ if (onsolder && !hasParts && !warned) \ { \ - warned = true; \ + warned = pcb_true; \ Message \ (PCB_MSG_WARNING, _("Warning: All of the pads are on the opposite\n" \ "side from the component - that's probably not what\n" \ @@ -701,7 +701,7 @@ line->Clearance, line->Thickness + line->Clearance, NULL, line->Number ? line->Number : num, MakeFlags(onsolderflag)); MAYBE_WARN(); - hasParts = true; + hasParts = pcb_true; } END_LOOP; POLYGON_LOOP(layer); @@ -709,7 +709,7 @@ Coord x1, y1, x2, y2, w, h, t; if (!polygon_is_rectangle(polygon)) { - crooked = true; + crooked = pcb_true; continue; } @@ -726,7 +726,7 @@ x1, y1, x2, y2, t, 2 * conf_core.design.clearance, t + conf_core.design.clearance, NULL, num, MakeFlags(PCB_FLAG_SQUARE | onsolderflag)); MAYBE_WARN(); - hasParts = true; + hasParts = pcb_true; } END_LOOP; } @@ -739,19 +739,19 @@ if (line->Number && !NAMEONPCB_NAME(Element)) NAMEONPCB_NAME(Element) = pcb_strdup(line->Number); CreateNewLineInElement(Element, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness); - hasParts = true; + hasParts = pcb_true; } END_LOOP; ARC_LOOP(&Buffer->Data->SILKLAYER); { CreateNewArcInElement(Element, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta, arc->Thickness); - hasParts = true; + hasParts = pcb_true; } END_LOOP; if (!hasParts) { DestroyObject(PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element); Message(PCB_MSG_DEFAULT, _("There was nothing to convert!\n" "Elements must have some silk, pads or pins.\n")); - return (false); + return (pcb_false); } if (crooked) Message(PCB_MSG_DEFAULT, _("There were polygons that can't be made into pins!\n" "So they were not included in the element\n")); @@ -763,7 +763,7 @@ ClearBuffer(Buffer); MoveObjectToBuffer(Buffer->Data, PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element); SetBufferBoundingBox(Buffer); - return (true); + return (pcb_true); } /* --------------------------------------------------------------------------- @@ -771,7 +771,7 @@ * parse the file with enabled 'PCB mode' (see parser) * if successful, update some other stuff */ -bool LoadLayoutToBuffer(BufferTypePtr Buffer, const char *Filename, const char *fmt) +pcb_bool LoadLayoutToBuffer(BufferTypePtr Buffer, const char *Filename, const char *fmt) { PCBTypePtr newPCB = CreateNewPCB(); @@ -786,13 +786,13 @@ Buffer->Y = newPCB->CursorY; RemovePCB(newPCB); Buffer->Data->pcb = PCB; - return (true); + return (pcb_true); } /* release unused memory */ RemovePCB(newPCB); Buffer->Data->pcb = PCB; - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- @@ -1006,9 +1006,9 @@ else angle_s = argv[0]; - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); FreeRotateBuffer(PASTEBUFFER, strtod(angle_s, 0)); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } @@ -1310,10 +1310,10 @@ const char *forces = argc > 3 ? argv[3] : NULL; const char *name; static char *default_file = NULL; - bool free_name = false; + pcb_bool free_name = pcb_false; int force = (forces != NULL) && ((*forces == '1') || (*forces == 'y') || (*forces == 'Y')); - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); if (function) { switch (funchash_get(function, NULL)) { /* clear contents of paste buffer */ @@ -1323,7 +1323,7 @@ /* copies objects to paste buffer */ case F_AddSelected: - AddSelectedToBuffer(PASTEBUFFER, 0, 0, false); + AddSelectedToBuffer(PASTEBUFFER, 0, 0, pcb_false); break; /* converts buffer contents into an element */ @@ -1353,7 +1353,7 @@ Message(PCB_MSG_DEFAULT, _("Buffer has no elements!\n")); break; } - free_name = false; + free_name = pcb_false; if (argc <= 1) { name = gui->fileselect(_("Save Paste Buffer As ..."), _("Choose a file to save the contents of the\n" @@ -1366,7 +1366,7 @@ if (name && *name) { default_file = pcb_strdup(name); } - free_name = true; + free_name = pcb_true; } else @@ -1392,7 +1392,7 @@ { static Coord oldx = 0, oldy = 0; Coord x, y; - bool absolute; + pcb_bool absolute; if (argc == 1) { x = y = 0; @@ -1406,7 +1406,7 @@ y += oldy; } else { - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); AFAIL(pastebuffer); } @@ -1413,7 +1413,7 @@ oldx = x; oldy = y; if (CopyPastebufferToLayout(x, y)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); } break; @@ -1429,7 +1429,7 @@ } } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } Index: trunk/src/buffer.h =================================================================== --- trunk/src/buffer.h (revision 3382) +++ trunk/src/buffer.h (revision 3383) @@ -36,11 +36,11 @@ */ void SetBufferBoundingBox(BufferTypePtr); void ClearBuffer(BufferTypePtr); -void AddSelectedToBuffer(BufferTypePtr, Coord, Coord, bool); -bool LoadElementToBuffer(BufferTypePtr, const char *); -bool ConvertBufferToElement(BufferTypePtr); -bool SmashBufferElement(BufferTypePtr); -bool LoadLayoutToBuffer(BufferTypePtr Buffer, const char *Filename, const char *fmt); +void AddSelectedToBuffer(BufferTypePtr, Coord, Coord, pcb_bool); +pcb_bool LoadElementToBuffer(BufferTypePtr, const char *); +pcb_bool ConvertBufferToElement(BufferTypePtr); +pcb_bool SmashBufferElement(BufferTypePtr); +pcb_bool LoadLayoutToBuffer(BufferTypePtr Buffer, const char *Filename, const char *fmt); void RotateBuffer(BufferTypePtr, BYTE); void SelectPasteBuffer(int); void pcb_swap_buffers(void); Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 3382) +++ trunk/src/change.c (revision 3383) @@ -401,7 +401,7 @@ */ static void *ChangeViaThermal(PinTypePtr Via) { - AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, false); + AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, CURRENT, Via); AddObjectToFlagUndoList(PCB_TYPE_VIA, Via, Via, Via); if (!Delta) /* remove the thermals */ @@ -408,7 +408,7 @@ CLEAR_THERM(INDEXOFCURRENT, Via); else ASSIGN_THERM(INDEXOFCURRENT, Delta, Via); - AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, true); + AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, CURRENT, Via); DrawVia(Via); return Via; @@ -420,7 +420,7 @@ */ static void *ChangePinThermal(ElementTypePtr element, PinTypePtr Pin) { - AddObjectToClearPolyUndoList(PCB_TYPE_PIN, element, Pin, Pin, false); + AddObjectToClearPolyUndoList(PCB_TYPE_PIN, element, Pin, Pin, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, CURRENT, Pin); AddObjectToFlagUndoList(PCB_TYPE_PIN, element, Pin, Pin); if (!Delta) /* remove the thermals */ @@ -427,7 +427,7 @@ CLEAR_THERM(INDEXOFCURRENT, Pin); else ASSIGN_THERM(INDEXOFCURRENT, Delta, Pin); - AddObjectToClearPolyUndoList(PCB_TYPE_PIN, element, Pin, Pin, true); + AddObjectToClearPolyUndoList(PCB_TYPE_PIN, element, Pin, Pin, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, CURRENT, Pin); DrawPin(Pin); return Pin; @@ -647,7 +647,7 @@ */ static void *ChangeElement2ndSize(ElementTypePtr Element) { - bool changed = false; + pcb_bool changed = pcb_false; Coord value; if (TEST_FLAG(PCB_FLAG_LOCK, Element)) @@ -658,7 +658,7 @@ if (value <= MAX_PINORVIASIZE && value >= MIN_PINORVIAHOLE && (TEST_FLAG(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - MIN_PINORVIACOPPER) && value != pin->DrillingHole) { - changed = true; + changed = pcb_true; AddObjectTo2ndSizeUndoList(PCB_TYPE_PIN, Element, pin, pin); ErasePin(pin); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, pin); @@ -684,7 +684,7 @@ */ static void *ChangeElement1stSize(ElementTypePtr Element) { - bool changed = false; + pcb_bool changed = pcb_false; Coord value; if (TEST_FLAG(PCB_FLAG_LOCK, Element)) @@ -693,7 +693,7 @@ { value = (Absolute) ? Absolute : pin->DrillingHole + Delta; if (value <= MAX_PINORVIASIZE && value >= pin->DrillingHole + MIN_PINORVIACOPPER && value != pin->Thickness) { - changed = true; + changed = pcb_true; AddObjectToSizeUndoList(PCB_TYPE_PIN, Element, pin, pin); ErasePin(pin); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, pin); @@ -719,7 +719,7 @@ */ static void *ChangeElementClearSize(ElementTypePtr Element) { - bool changed = false; + pcb_bool changed = pcb_false; Coord value; if (TEST_FLAG(PCB_FLAG_LOCK, Element)) @@ -730,7 +730,7 @@ if (value <= MAX_PINORVIASIZE && value >= MIN_PINORVIAHOLE && (TEST_FLAG(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - MIN_PINORVIACOPPER) && value != pin->Clearance) { - changed = true; + changed = pcb_true; AddObjectToClearSizeUndoList(PCB_TYPE_PIN, Element, pin, pin); ErasePin(pin); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, pin); @@ -749,7 +749,7 @@ { value = (Absolute) ? Absolute : pad->Clearance + Delta; if (value <= MAX_PINORVIASIZE && value >= MIN_PINORVIAHOLE && value != pad->Clearance) { - changed = true; + changed = pcb_true; AddObjectToClearSizeUndoList(PCB_TYPE_PAD, Element, pad, pad); ErasePad(pad); RestoreToPolygon(PCB->Data, PCB_TYPE_PAD, Element, pad); @@ -962,7 +962,7 @@ static void *ChangeElementSize(ElementTypePtr Element) { Coord value; - bool changed = false; + pcb_bool changed = pcb_false; if (TEST_FLAG(PCB_FLAG_LOCK, Element)) return (NULL); @@ -974,7 +974,7 @@ if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != line->Thickness) { AddObjectToSizeUndoList(PCB_TYPE_ELEMENT_LINE, Element, line, line); line->Thickness = value; - changed = true; + changed = pcb_true; } } END_LOOP; @@ -984,7 +984,7 @@ if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != arc->Thickness) { AddObjectToSizeUndoList(PCB_TYPE_ELEMENT_ARC, Element, arc, arc); arc->Thickness = value; - changed = true; + changed = pcb_true; } } END_LOOP; @@ -1179,7 +1179,7 @@ * sets data of a text object and calculates bounding box * memory must have already been allocated * the one for the new string is allocated - * returns true if the string has been changed + * returns pcb_true if the string has been changed */ static void *ChangeTextName(LayerTypePtr Layer, TextTypePtr Text) { @@ -1202,12 +1202,12 @@ /* --------------------------------------------------------------------------- * changes the name of a layout; memory has to be already allocated */ -bool ChangeLayoutName(char *Name) +pcb_bool ChangeLayoutName(char *Name) { free(PCB->Name); PCB->Name = Name; hid_action("PCBChanged"); - return (true); + return (pcb_true); } /* --------------------------------------------------------------------------- @@ -1214,26 +1214,26 @@ * changes the side of the board an element is on * returns TRUE if done */ -bool ChangeElementSide(ElementTypePtr Element, Coord yoff) +pcb_bool ChangeElementSide(ElementTypePtr Element, Coord yoff) { if (TEST_FLAG(PCB_FLAG_LOCK, Element)) - return (false); + return (pcb_false); EraseElement(Element); AddObjectToMirrorUndoList(PCB_TYPE_ELEMENT, Element, Element, Element, yoff); MirrorElementCoordinates(PCB->Data, Element, yoff); DrawElement(Element); - return (true); + return (pcb_true); } /* --------------------------------------------------------------------------- * changes the name of a layer; memory has to be already allocated */ -bool ChangeLayerName(LayerTypePtr Layer, char *Name) +pcb_bool ChangeLayerName(LayerTypePtr Layer, char *Name) { free((char*)CURRENT->Name); CURRENT->Name = Name; hid_action("LayersChanged"); - return (true); + return (pcb_true); } /* --------------------------------------------------------------------------- @@ -1245,13 +1245,13 @@ return (NULL); EraseLine(Line); if (TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) { - AddObjectToClearPolyUndoList(PCB_TYPE_LINE, Layer, Line, Line, false); + AddObjectToClearPolyUndoList(PCB_TYPE_LINE, Layer, Line, Line, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); } AddObjectToFlagUndoList(PCB_TYPE_LINE, Layer, Line, Line); TOGGLE_FLAG(PCB_FLAG_CLEARLINE, Line); if (TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) { - AddObjectToClearPolyUndoList(PCB_TYPE_LINE, Layer, Line, Line, true); + AddObjectToClearPolyUndoList(PCB_TYPE_LINE, Layer, Line, Line, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); } DrawLine(Layer, Line); @@ -1288,13 +1288,13 @@ EraseArc(Arc); if (TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) { RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); - AddObjectToClearPolyUndoList(PCB_TYPE_ARC, Layer, Arc, Arc, false); + AddObjectToClearPolyUndoList(PCB_TYPE_ARC, Layer, Arc, Arc, pcb_false); } AddObjectToFlagUndoList(PCB_TYPE_ARC, Layer, Arc, Arc); TOGGLE_FLAG(PCB_FLAG_CLEARLINE, Arc); if (TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) { ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); - AddObjectToClearPolyUndoList(PCB_TYPE_ARC, Layer, Arc, Arc, true); + AddObjectToClearPolyUndoList(PCB_TYPE_ARC, Layer, Arc, Arc, pcb_true); } DrawArc(Layer, Arc); return (Arc); @@ -1329,13 +1329,13 @@ return (NULL); EraseText(Layer, Text); if (TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) { - AddObjectToClearPolyUndoList(PCB_TYPE_TEXT, Layer, Text, Text, false); + AddObjectToClearPolyUndoList(PCB_TYPE_TEXT, Layer, Text, Text, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); } AddObjectToFlagUndoList(PCB_TYPE_LINE, Layer, Text, Text); TOGGLE_FLAG(PCB_FLAG_CLEARLINE, Text); if (TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) { - AddObjectToClearPolyUndoList(PCB_TYPE_TEXT, Layer, Text, Text, true); + AddObjectToClearPolyUndoList(PCB_TYPE_TEXT, Layer, Text, Text, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); } DrawText(Layer, Text); @@ -1490,11 +1490,11 @@ if (TEST_FLAG(PCB_FLAG_LOCK, Pad)) return (NULL); ErasePad(Pad); - AddObjectToClearPolyUndoList(PCB_TYPE_PAD, Element, Pad, Pad, false); + AddObjectToClearPolyUndoList(PCB_TYPE_PAD, Element, Pad, Pad, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_PAD, Element, Pad); AddObjectToFlagUndoList(PCB_TYPE_PAD, Element, Pad, Pad); TOGGLE_FLAG(PCB_FLAG_SQUARE, Pad); - AddObjectToClearPolyUndoList(PCB_TYPE_PAD, Element, Pad, Pad, true); + AddObjectToClearPolyUndoList(PCB_TYPE_PAD, Element, Pad, Pad, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_PAD, Element, Pad); DrawPad(Pad); return (Pad); @@ -1534,7 +1534,7 @@ if (TEST_FLAG(PCB_FLAG_LOCK, Via)) return (NULL); EraseVia(Via); - AddObjectToClearPolyUndoList(PCB_TYPE_VIA, NULL, Via, Via, false); + AddObjectToClearPolyUndoList(PCB_TYPE_VIA, NULL, Via, Via, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, NULL, Via); AddObjectToFlagUndoList(PCB_TYPE_VIA, NULL, Via, Via); ASSIGN_SQUARE(Absolute, Via); @@ -1543,7 +1543,7 @@ else SET_FLAG(PCB_FLAG_SQUARE, Via); SetPinBoundingBox(Via); - AddObjectToClearPolyUndoList(PCB_TYPE_VIA, NULL, Via, Via, true); + AddObjectToClearPolyUndoList(PCB_TYPE_VIA, NULL, Via, Via, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, NULL, Via); DrawVia(Via); return (Via); @@ -1557,7 +1557,7 @@ if (TEST_FLAG(PCB_FLAG_LOCK, Pin)) return (NULL); ErasePin(Pin); - AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, false); + AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); AddObjectToFlagUndoList(PCB_TYPE_PIN, Element, Pin, Pin); ASSIGN_SQUARE(Absolute, Pin); @@ -1566,7 +1566,7 @@ else SET_FLAG(PCB_FLAG_SQUARE, Pin); SetPinBoundingBox(Pin); - AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, true); + AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); DrawPin(Pin); return (Pin); @@ -1602,11 +1602,11 @@ if (TEST_FLAG(PCB_FLAG_LOCK, Via)) return (NULL); EraseVia(Via); - AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, false); + AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); AddObjectToFlagUndoList(PCB_TYPE_VIA, Via, Via, Via); TOGGLE_FLAG(PCB_FLAG_OCTAGON, Via); - AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, true); + AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); DrawVia(Via); return (Via); @@ -1642,11 +1642,11 @@ if (TEST_FLAG(PCB_FLAG_LOCK, Pin)) return (NULL); ErasePin(Pin); - AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, false); + AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); AddObjectToFlagUndoList(PCB_TYPE_PIN, Element, Pin, Pin); TOGGLE_FLAG(PCB_FLAG_OCTAGON, Pin); - AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, true); + AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); DrawPin(Pin); return (Pin); @@ -1677,10 +1677,10 @@ /* --------------------------------------------------------------------------- * changes the hole flag of a via */ -bool ChangeHole(PinTypePtr Via) +pcb_bool ChangeHole(PinTypePtr Via) { if (TEST_FLAG(PCB_FLAG_LOCK, Via)) - return (false); + return (pcb_false); EraseVia(Via); AddObjectToFlagUndoList(PCB_TYPE_VIA, Via, Via, Via); AddObjectToMaskSizeUndoList(PCB_TYPE_VIA, Via, Via, Via); @@ -1707,22 +1707,22 @@ ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); DrawVia(Via); Draw(); - return (true); + return (pcb_true); } /* --------------------------------------------------------------------------- * changes the nopaste flag of a pad */ -bool ChangePaste(PadTypePtr Pad) +pcb_bool ChangePaste(PadTypePtr Pad) { if (TEST_FLAG(PCB_FLAG_LOCK, Pad)) - return (false); + return (pcb_false); ErasePad(Pad); AddObjectToFlagUndoList(PCB_TYPE_PAD, Pad, Pad, Pad); TOGGLE_FLAG(PCB_FLAG_NOPASTE, Pad); DrawPad(Pad); Draw(); - return (true); + return (pcb_true); } /* --------------------------------------------------------------------------- @@ -1732,7 +1732,7 @@ { if (TEST_FLAG(PCB_FLAG_LOCK, Polygon)) return (NULL); - AddObjectToClearPolyUndoList(PCB_TYPE_POLYGON, Layer, Polygon, Polygon, true); + AddObjectToClearPolyUndoList(PCB_TYPE_POLYGON, Layer, Polygon, Polygon, pcb_true); AddObjectToFlagUndoList(PCB_TYPE_POLYGON, Layer, Polygon, Polygon); TOGGLE_FLAG(PCB_FLAG_CLEARPOLY, Polygon); InitClip(PCB->Data, Layer, Polygon); @@ -1742,11 +1742,11 @@ /* ---------------------------------------------------------------------- * changes the side of all selected and visible elements - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelectedElementSide(void) +pcb_bool ChangeSelectedElementSide(void) { - bool change = false; + pcb_bool change = pcb_false; /* setup identifiers */ if (PCB->PinOn && PCB->ElementOn) @@ -1766,14 +1766,14 @@ /* ---------------------------------------------------------------------- * changes the thermals on all selected and visible pins - * and/or vias. Returns true if anything has changed + * and/or vias. Returns pcb_true if anything has changed */ -bool ChangeSelectedThermals(int types, int therm_style) +pcb_bool ChangeSelectedThermals(int types, int therm_style) { - bool change = false; + pcb_bool change = pcb_false; Delta = therm_style; - change = SelectedOperation(&ChangeThermalFunctions, false, types); + change = SelectedOperation(&ChangeThermalFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1783,17 +1783,17 @@ /* ---------------------------------------------------------------------- * changes the size of all selected and visible object types - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelectedSize(int types, Coord Difference, bool fixIt) +pcb_bool ChangeSelectedSize(int types, Coord Difference, pcb_bool fixIt) { - bool change = false; + pcb_bool change = pcb_false; /* setup identifiers */ Absolute = (fixIt) ? Difference : 0; Delta = Difference; - change = SelectedOperation(&ChangeSizeFunctions, false, types); + change = SelectedOperation(&ChangeSizeFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1803,19 +1803,19 @@ /* ---------------------------------------------------------------------- * changes the clearance size of all selected and visible objects - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelectedClearSize(int types, Coord Difference, bool fixIt) +pcb_bool ChangeSelectedClearSize(int types, Coord Difference, pcb_bool fixIt) { - bool change = false; + pcb_bool change = pcb_false; /* setup identifiers */ Absolute = (fixIt) ? Difference : 0; Delta = Difference; if (conf_core.editor.show_mask) - change = SelectedOperation(&ChangeMaskSizeFunctions, false, types); + change = SelectedOperation(&ChangeMaskSizeFunctions, pcb_false, types); else - change = SelectedOperation(&ChangeClearSizeFunctions, false, types); + change = SelectedOperation(&ChangeClearSizeFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1825,16 +1825,16 @@ /* -------------------------------------------------------------------------- * changes the 2nd size (drilling hole) of all selected and visible objects - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelected2ndSize(int types, Coord Difference, bool fixIt) +pcb_bool ChangeSelected2ndSize(int types, Coord Difference, pcb_bool fixIt) { - bool change = false; + pcb_bool change = pcb_false; /* setup identifiers */ Absolute = (fixIt) ? Difference : 0; Delta = Difference; - change = SelectedOperation(&Change2ndSizeFunctions, false, types); + change = SelectedOperation(&Change2ndSizeFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1844,13 +1844,13 @@ /* ---------------------------------------------------------------------- * changes the clearance flag (join) of all selected and visible lines - * and/or arcs. Returns true if anything has changed + * and/or arcs. Returns pcb_true if anything has changed */ -bool ChangeSelectedJoin(int types) +pcb_bool ChangeSelectedJoin(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&ChangeJoinFunctions, false, types); + change = SelectedOperation(&ChangeJoinFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1860,13 +1860,13 @@ /* ---------------------------------------------------------------------- * changes the clearance flag (join) of all selected and visible lines - * and/or arcs. Returns true if anything has changed + * and/or arcs. Returns pcb_true if anything has changed */ -bool SetSelectedJoin(int types) +pcb_bool SetSelectedJoin(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&SetJoinFunctions, false, types); + change = SelectedOperation(&SetJoinFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1876,13 +1876,13 @@ /* ---------------------------------------------------------------------- * changes the clearance flag (join) of all selected and visible lines - * and/or arcs. Returns true if anything has changed + * and/or arcs. Returns pcb_true if anything has changed */ -bool ClrSelectedJoin(int types) +pcb_bool ClrSelectedJoin(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&ClrJoinFunctions, false, types); + change = SelectedOperation(&ClrJoinFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1892,13 +1892,13 @@ /* ---------------------------------------------------------------------- * changes the nonetlist-flag of all selected and visible elements - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelectedNonetlist(int types) +pcb_bool ChangeSelectedNonetlist(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&ChangeNonetlistFunctions, false, types); + change = SelectedOperation(&ChangeNonetlistFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1909,13 +1909,13 @@ #if 0 /* ---------------------------------------------------------------------- * sets the square-flag of all selected and visible pins or pads - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool SetSelectedNonetlist(int types) +pcb_bool SetSelectedNonetlist(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&SetNonetlistFunctions, false, types); + change = SelectedOperation(&SetNonetlistFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1925,13 +1925,13 @@ /* ---------------------------------------------------------------------- * clears the square-flag of all selected and visible pins or pads - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ClrSelectedNonetlist(int types) +pcb_bool ClrSelectedNonetlist(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&ClrNonetlistFunctions, false, types); + change = SelectedOperation(&ClrNonetlistFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1942,13 +1942,13 @@ /* ---------------------------------------------------------------------- * changes the square-flag of all selected and visible pins or pads - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelectedSquare(int types) +pcb_bool ChangeSelectedSquare(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&ChangeSquareFunctions, false, types); + change = SelectedOperation(&ChangeSquareFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1958,13 +1958,13 @@ /* ---------------------------------------------------------------------- * sets the square-flag of all selected and visible pins or pads - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool SetSelectedSquare(int types) +pcb_bool SetSelectedSquare(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&SetSquareFunctions, false, types); + change = SelectedOperation(&SetSquareFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1974,13 +1974,13 @@ /* ---------------------------------------------------------------------- * clears the square-flag of all selected and visible pins or pads - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ClrSelectedSquare(int types) +pcb_bool ClrSelectedSquare(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&ClrSquareFunctions, false, types); + change = SelectedOperation(&ClrSquareFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -1990,13 +1990,13 @@ /* ---------------------------------------------------------------------- * changes the octagon-flag of all selected and visible pins and vias - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelectedOctagon(int types) +pcb_bool ChangeSelectedOctagon(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&ChangeOctagonFunctions, false, types); + change = SelectedOperation(&ChangeOctagonFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -2006,13 +2006,13 @@ /* ---------------------------------------------------------------------- * sets the octagon-flag of all selected and visible pins and vias - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool SetSelectedOctagon(int types) +pcb_bool SetSelectedOctagon(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&SetOctagonFunctions, false, types); + change = SelectedOperation(&SetOctagonFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -2022,13 +2022,13 @@ /* ---------------------------------------------------------------------- * clears the octagon-flag of all selected and visible pins and vias - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ClrSelectedOctagon(int types) +pcb_bool ClrSelectedOctagon(int types) { - bool change = false; + pcb_bool change = pcb_false; - change = SelectedOperation(&ClrOctagonFunctions, false, types); + change = SelectedOperation(&ClrOctagonFunctions, pcb_false, types); if (change) { Draw(); IncrementUndoSerialNumber(); @@ -2038,11 +2038,11 @@ /* ---------------------------------------------------------------------- * changes the hole-flag of all selected and visible vias - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelectedHole(void) +pcb_bool ChangeSelectedHole(void) { - bool change = false; + pcb_bool change = pcb_false; if (PCB->ViaOn) VIA_LOOP(PCB->Data); @@ -2060,11 +2060,11 @@ /* ---------------------------------------------------------------------- * changes the no paste-flag of all selected and visible pads - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool ChangeSelectedPaste(void) +pcb_bool ChangeSelectedPaste(void) { - bool change = false; + pcb_bool change = pcb_false; ALLPAD_LOOP(PCB->Data); { @@ -2082,11 +2082,11 @@ /* --------------------------------------------------------------------------- * changes the size of the passed object; element size is silk size - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObjectSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, bool fixIt) +pcb_bool ChangeObjectSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, pcb_bool fixIt) { - bool change; + pcb_bool change; /* setup identifier */ Absolute = (fixIt) ? Difference : 0; @@ -2101,11 +2101,11 @@ /* --------------------------------------------------------------------------- * changes the size of the passed object; element size is pin ring sizes - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObject1stSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, bool fixIt) +pcb_bool ChangeObject1stSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, pcb_bool fixIt) { - bool change; + pcb_bool change; /* setup identifier */ Absolute = (fixIt) ? Difference : 0; @@ -2120,11 +2120,11 @@ /* --------------------------------------------------------------------------- * changes the clearance size of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObjectClearSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, bool fixIt) +pcb_bool ChangeObjectClearSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, pcb_bool fixIt) { - bool change; + pcb_bool change; /* setup identifier */ Absolute = (fixIt) ? Difference : 0; @@ -2142,12 +2142,12 @@ /* --------------------------------------------------------------------------- * changes the thermal of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed * */ -bool ChangeObjectThermal(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int therm_type) +pcb_bool ChangeObjectThermal(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int therm_type) { - bool change; + pcb_bool change; Delta = Absolute = therm_type; change = (ObjectOperation(&ChangeThermalFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL); @@ -2160,11 +2160,11 @@ /* --------------------------------------------------------------------------- * changes the 2nd size of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObject2ndSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, bool fixIt, bool incundo) +pcb_bool ChangeObject2ndSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, pcb_bool fixIt, pcb_bool incundo) { - bool change; + pcb_bool change; /* setup identifier */ Absolute = (fixIt) ? Difference : 0; @@ -2180,11 +2180,11 @@ /* --------------------------------------------------------------------------- * changes the mask size of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObjectMaskSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, bool fixIt) +pcb_bool ChangeObjectMaskSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, Coord Difference, pcb_bool fixIt) { - bool change; + pcb_bool change; /* setup identifier */ Absolute = (fixIt) ? Difference : 0; @@ -2233,143 +2233,143 @@ /* --------------------------------------------------------------------------- * changes the clearance-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool ChangeObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&ChangeJoinFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * sets the clearance-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool SetObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool SetObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&SetJoinFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * clears the clearance-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ClrObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool ClrObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&ClrJoinFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * changes the square-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObjectNonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool ChangeObjectNonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&ChangeNonetlistFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * changes the square-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int style) +pcb_bool ChangeObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int style) { Absolute = style; if (ObjectOperation(&ChangeSquareFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * sets the square-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool SetObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool SetObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&SetSquareFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * clears the square-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ClrObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool ClrObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&ClrSquareFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * changes the octagon-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ChangeObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool ChangeObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&ChangeOctagonFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * sets the octagon-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool SetObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool SetObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&SetOctagonFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * clears the octagon-flag of the passed object - * Returns true if anything is changed + * Returns pcb_true if anything is changed */ -bool ClrObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool ClrObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (ObjectOperation(&ClrOctagonFunctions, Type, Ptr1, Ptr2, Ptr3) != NULL) { Draw(); IncrementUndoSerialNumber(); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 3382) +++ trunk/src/change.h (revision 3383) @@ -66,45 +66,45 @@ #define CHANGEMASKSIZE_TYPES \ (PCB_TYPE_PIN | PCB_TYPE_VIA | PCB_TYPE_PAD) -bool ChangeLayoutName(char *); -bool ChangeLayerName(LayerTypePtr, char *); -bool ChangeSelectedSize(int, Coord, bool); -bool ChangeSelectedClearSize(int, Coord, bool); -bool ChangeSelected2ndSize(int, Coord, bool); -bool ChangeSelectedMaskSize(int, Coord, bool); -bool ChangeSelectedJoin(int); -bool SetSelectedJoin(int); -bool ClrSelectedJoin(int); -bool ChangeSelectedNonetlist(int); -bool ChangeSelectedSquare(int); -bool SetSelectedSquare(int); -bool ClrSelectedSquare(int); -bool ChangeSelectedThermals(int, int); -bool ChangeSelectedHole(void); -bool ChangeSelectedPaste(void); -bool ChangeSelectedOctagon(int); -bool SetSelectedOctagon(int); -bool ClrSelectedOctagon(int); -bool ChangeSelectedElementSide(void); -bool ChangeElementSide(ElementTypePtr, Coord); -bool ChangeHole(PinTypePtr); -bool ChangePaste(PadTypePtr); -bool ChangeObjectSize(int, void *, void *, void *, Coord, bool); -bool ChangeObject1stSize(int, void *, void *, void *, Coord, bool); -bool ChangeObjectThermal(int, void *, void *, void *, int); -bool ChangeObjectClearSize(int, void *, void *, void *, Coord, bool); -bool ChangeObject2ndSize(int, void *, void *, void *, Coord, bool, bool); -bool ChangeObjectMaskSize(int, void *, void *, void *, Coord, bool); -bool ChangeObjectJoin(int, void *, void *, void *); -bool SetObjectJoin(int, void *, void *, void *); -bool ClrObjectJoin(int, void *, void *, void *); -bool ChangeObjectNonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3); -bool ChangeObjectSquare(int, void *, void *, void *, int); -bool SetObjectSquare(int, void *, void *, void *); -bool ClrObjectSquare(int, void *, void *, void *); -bool ChangeObjectOctagon(int, void *, void *, void *); -bool SetObjectOctagon(int, void *, void *, void *); -bool ClrObjectOctagon(int, void *, void *, void *); +pcb_bool ChangeLayoutName(char *); +pcb_bool ChangeLayerName(LayerTypePtr, char *); +pcb_bool ChangeSelectedSize(int, Coord, pcb_bool); +pcb_bool ChangeSelectedClearSize(int, Coord, pcb_bool); +pcb_bool ChangeSelected2ndSize(int, Coord, pcb_bool); +pcb_bool ChangeSelectedMaskSize(int, Coord, pcb_bool); +pcb_bool ChangeSelectedJoin(int); +pcb_bool SetSelectedJoin(int); +pcb_bool ClrSelectedJoin(int); +pcb_bool ChangeSelectedNonetlist(int); +pcb_bool ChangeSelectedSquare(int); +pcb_bool SetSelectedSquare(int); +pcb_bool ClrSelectedSquare(int); +pcb_bool ChangeSelectedThermals(int, int); +pcb_bool ChangeSelectedHole(void); +pcb_bool ChangeSelectedPaste(void); +pcb_bool ChangeSelectedOctagon(int); +pcb_bool SetSelectedOctagon(int); +pcb_bool ClrSelectedOctagon(int); +pcb_bool ChangeSelectedElementSide(void); +pcb_bool ChangeElementSide(ElementTypePtr, Coord); +pcb_bool ChangeHole(PinTypePtr); +pcb_bool ChangePaste(PadTypePtr); +pcb_bool ChangeObjectSize(int, void *, void *, void *, Coord, pcb_bool); +pcb_bool ChangeObject1stSize(int, void *, void *, void *, Coord, pcb_bool); +pcb_bool ChangeObjectThermal(int, void *, void *, void *, int); +pcb_bool ChangeObjectClearSize(int, void *, void *, void *, Coord, pcb_bool); +pcb_bool ChangeObject2ndSize(int, void *, void *, void *, Coord, pcb_bool, pcb_bool); +pcb_bool ChangeObjectMaskSize(int, void *, void *, void *, Coord, pcb_bool); +pcb_bool ChangeObjectJoin(int, void *, void *, void *); +pcb_bool SetObjectJoin(int, void *, void *, void *); +pcb_bool ClrObjectJoin(int, void *, void *, void *); +pcb_bool ChangeObjectNonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3); +pcb_bool ChangeObjectSquare(int, void *, void *, void *, int); +pcb_bool SetObjectSquare(int, void *, void *, void *); +pcb_bool ClrObjectSquare(int, void *, void *, void *); +pcb_bool ChangeObjectOctagon(int, void *, void *, void *); +pcb_bool SetObjectOctagon(int, void *, void *, void *); +pcb_bool ClrObjectOctagon(int, void *, void *, void *); void *ChangeObjectName(int, void *, void *, void *, char *); void *QueryInputAndChangeObjectName(int, void *, void *, void *, int); void ChangePCBSize(Coord, Coord); Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 3382) +++ trunk/src/change_act.c (revision 3383) @@ -76,7 +76,7 @@ const char *function = ACTION_ARG(0); const char *delta = ACTION_ARG(1); const char *units = ACTION_ARG(2); - bool absolute; + pcb_bool absolute; Coord value; int type = PCB_TYPE_NONE; void *ptr1, *ptr2, *ptr3; @@ -104,33 +104,33 @@ { if (type != PCB_TYPE_NONE) if (ChangeObjectClearSize(type, ptr1, ptr2, ptr3, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedVias: if (ChangeSelectedClearSize(PCB_TYPE_VIA, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPads: if (ChangeSelectedClearSize(PCB_TYPE_PAD, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (ChangeSelectedClearSize(PCB_TYPE_PIN, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedLines: if (ChangeSelectedClearSize(PCB_TYPE_LINE, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedArcs: if (ChangeSelectedClearSize(PCB_TYPE_ARC, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (ChangeSelectedClearSize(CHANGECLEARSIZE_TYPES, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -172,8 +172,8 @@ static void ChangeFlag(const char *what, const char *flag_name, int value, const char *cmd_name) { - bool(*set_object) (int, void *, void *, void *); - bool(*set_selected) (int); + pcb_bool(*set_object) (int, void *, void *, void *); + pcb_bool(*set_selected) (int); if (NSTRCMP(flag_name, "square") == 0) { set_object = value ? SetObjectSquare : ClrObjectSquare; @@ -204,49 +204,49 @@ if (TEST_FLAG(PCB_FLAG_LOCK, (PinTypePtr) ptr2)) Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); if (set_object(type, ptr1, ptr2, ptr3)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedVias: if (set_selected(PCB_TYPE_VIA)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (set_selected(PCB_TYPE_PIN)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPads: if (set_selected(PCB_TYPE_PAD)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedLines: if (set_selected(PCB_TYPE_LINE)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedTexts: if (set_selected(PCB_TYPE_TEXT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedNames: if (set_selected(PCB_TYPE_ELEMENT_NAME)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedElements: if (set_selected(PCB_TYPE_ELEMENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (set_selected(CHANGESIZE_TYPES)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -284,7 +284,7 @@ case F_SelectedVias: case F_Selected: if (ChangeSelectedHole()) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -326,7 +326,7 @@ case F_SelectedPads: case F_Selected: if (ChangeSelectedPaste()) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -389,7 +389,7 @@ const char *function = ACTION_ARG(0); const char *delta = ACTION_ARG(1); const char *units = ACTION_ARG(2); - bool absolute; /* indicates if absolute size is given */ + pcb_bool absolute; /* indicates if absolute size is given */ Coord value; int type = PCB_TYPE_NONE, tostyle = 0; void *ptr1, *ptr2, *ptr3; @@ -417,58 +417,58 @@ Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); if (tostyle) { if (ChangeObject1stSize(type, ptr1, ptr2, ptr3, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); } else { if (ChangeObjectSize(type, ptr1, ptr2, ptr3, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); } break; } case F_SelectedVias: if (ChangeSelectedSize(PCB_TYPE_VIA, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (ChangeSelectedSize(PCB_TYPE_PIN, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPads: if (ChangeSelectedSize(PCB_TYPE_PAD, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedArcs: if (ChangeSelectedSize(PCB_TYPE_ARC, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedLines: if (ChangeSelectedSize(PCB_TYPE_LINE, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedTexts: if (ChangeSelectedSize(PCB_TYPE_TEXT, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedNames: if (ChangeSelectedSize(PCB_TYPE_ELEMENT_NAME, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedElements: if (ChangeSelectedSize(PCB_TYPE_ELEMENT, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (ChangeSelectedSize(CHANGESIZE_TYPES, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -494,7 +494,7 @@ int type = PCB_TYPE_NONE; void *ptr1, *ptr2, *ptr3; - bool absolute; + pcb_bool absolute; Coord value; if (function && delta) { @@ -518,24 +518,24 @@ { if (type != PCB_TYPE_NONE) - if (ChangeObject2ndSize(type, ptr1, ptr2, ptr3, value, absolute, true)) - SetChangedFlag(true); + if (ChangeObject2ndSize(type, ptr1, ptr2, ptr3, value, absolute, pcb_true)) + SetChangedFlag(pcb_true); break; } case F_SelectedVias: if (ChangeSelected2ndSize(PCB_TYPE_VIA, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (ChangeSelected2ndSize(PCB_TYPE_PIN, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (ChangeSelected2ndSize(PCB_TYPEMASK_PIN, value, absolute)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -585,7 +585,7 @@ * it is used in the undo list */ pin->Name = pcb_strdup(pinname); - SetChangedFlag(true); + SetChangedFlag(pcb_true); changed = 1; } } @@ -600,7 +600,7 @@ * it is used in the undo list */ pad->Name = pcb_strdup(pinname); - SetChangedFlag(true); + SetChangedFlag(pcb_true); changed = 1; } } @@ -670,7 +670,7 @@ else pinnum = 0; if (QueryInputAndChangeObjectName(type, ptr1, ptr2, ptr3, pinnum)) { - SetChangedFlag(true); + SetChangedFlag(pcb_true); if (type == PCB_TYPE_ELEMENT) { RubberbandTypePtr ptr; int i; @@ -697,7 +697,7 @@ name = gui->prompt_for(_("Enter the layout name:"), EMPTY(PCB->Name)); /* NB: ChangeLayoutName takes ownership of the passed memory */ if (name && ChangeLayoutName(name)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; /* change the name of the active layer */ @@ -705,7 +705,7 @@ name = gui->prompt_for(_("Enter the layer name:"), EMPTY(CURRENT->Name)); /* NB: ChangeLayerName takes ownership of the passed memory */ if (name && ChangeLayerName(CURRENT, name)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -742,24 +742,24 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (ChangeObjectJoin(type, ptr1, ptr2, ptr3)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedLines: if (ChangeSelectedJoin(PCB_TYPE_LINE)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedArcs: if (ChangeSelectedJoin(PCB_TYPE_ARC)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (ChangeSelectedJoin(CHANGEJOIN_TYPES)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -797,7 +797,7 @@ ptr3 = NULL; type = SearchScreen(x, y, CHANGENONETLIST_TYPES, &ptr1, &ptr2, &ptr3); if (ChangeObjectNonetlist(type, ptr1, ptr2, ptr3)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedElements: @@ -804,7 +804,7 @@ case F_Selected: case F_SelectedObjects: if (ChangeSelectedNonetlist(PCB_TYPE_ELEMENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -850,7 +850,7 @@ qstyle = 0; if (type != PCB_TYPE_NONE) if (ChangeObjectSquare(type, ptr1, ptr2, ptr3, qstyle)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); } break; } @@ -857,18 +857,18 @@ case F_SelectedElements: if (ChangeSelectedSquare(PCB_TYPE_ELEMENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (ChangeSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (ChangeSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -903,24 +903,24 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (SetObjectSquare(type, ptr1, ptr2, ptr3)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedElements: if (SetSelectedSquare(PCB_TYPE_ELEMENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (SetSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (SetSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -955,24 +955,24 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (ClrObjectSquare(type, ptr1, ptr2, ptr3)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedElements: if (ClrSelectedSquare(PCB_TYPE_ELEMENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (ClrSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (ClrSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -1006,29 +1006,29 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (ChangeObjectOctagon(type, ptr1, ptr2, ptr3)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedElements: if (ChangeSelectedOctagon(PCB_TYPE_ELEMENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (ChangeSelectedOctagon(PCB_TYPE_PIN)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedVias: if (ChangeSelectedOctagon(PCB_TYPE_VIA)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (ChangeSelectedOctagon(PCB_TYPEMASK_PIN)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -1061,29 +1061,29 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (SetObjectOctagon(type, ptr1, ptr2, ptr3)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedElements: if (SetSelectedOctagon(PCB_TYPE_ELEMENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (SetSelectedOctagon(PCB_TYPE_PIN)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedVias: if (SetSelectedOctagon(PCB_TYPE_VIA)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (SetSelectedOctagon(PCB_TYPEMASK_PIN)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -1117,29 +1117,29 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (ClrObjectOctagon(type, ptr1, ptr2, ptr3)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } case F_SelectedElements: if (ClrSelectedOctagon(PCB_TYPE_ELEMENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedPins: if (ClrSelectedOctagon(PCB_TYPE_PIN)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_SelectedVias: if (ClrSelectedOctagon(PCB_TYPE_VIA)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: if (ClrSelectedOctagon(PCB_TYPEMASK_PIN)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -1185,7 +1185,7 @@ int err = 0; if (function && *function && style && *style) { - bool absolute; + pcb_bool absolute; kind = GetValue(style, NULL, &absolute, NULL); if (absolute) @@ -1316,7 +1316,7 @@ const char *function = ACTION_ARG(0); const char *val = ACTION_ARG(1); const char *units = ACTION_ARG(2); - bool absolute; /* flag for 'absolute' value */ + pcb_bool absolute; /* flag for 'absolute' value */ double value; int err = 0; @@ -1324,22 +1324,22 @@ value = GetValue(val, units, &absolute, NULL); switch (funchash_get(function, NULL)) { case F_ViaDrillingHole: - SetViaDrillingHole(absolute ? value : value + conf_core.design.via_drilling_hole, false); + SetViaDrillingHole(absolute ? value : value + conf_core.design.via_drilling_hole, pcb_false); hid_action("RouteStylesChanged"); break; case F_Grid: if (absolute) - SetGrid(value, false); + SetGrid(value, pcb_false); else { /* On the way down, short against the minimum * PCB drawing unit */ if ((value + PCB->Grid) < 1) - SetGrid(1, false); + SetGrid(1, pcb_false); else if (PCB->Grid == 1) - SetGrid(value, false); + SetGrid(value, pcb_false); else - SetGrid(value + PCB->Grid, false); + SetGrid(value + PCB->Grid, pcb_false); } break; @@ -1351,7 +1351,7 @@ case F_Via: case F_ViaSize: - SetViaSize(absolute ? value : value + conf_core.design.via_thickness, false); + SetViaSize(absolute ? value : value + conf_core.design.via_thickness, pcb_false); hid_action("RouteStylesChanged"); break; Index: trunk/src/clip.c =================================================================== --- trunk/src/clip.c (revision 3382) +++ trunk/src/clip.c (revision 3383) @@ -30,10 +30,10 @@ #include /* Clip the line to the clipBox - * return true if something to be drawn - * false if the whole thing is clipped + * return pcb_true if something to be drawn + * pcb_false if the whole thing is clipped */ -bool ClipLine(double minx, double miny, double maxx, double maxy, double *x1, double *y1, double *x2, double *y2, double margin) +pcb_bool ClipLine(double minx, double miny, double maxx, double maxy, double *x1, double *y1, double *x2, double *y2, double margin) { double d, r; @@ -45,7 +45,7 @@ /* clip first point on left side */ if (*x1 < minx) { if (*x2 < minx) - return false; + return pcb_false; d = *x2 - *x1; r = (minx - *x1) / d; *x1 = minx; @@ -61,7 +61,7 @@ /* clip first point on right side */ if (*x1 > maxx) { if (*x2 > maxx) - return false; + return pcb_false; d = *x2 - *x1; r = (maxx - *x1) / d; *x1 = maxx; @@ -78,7 +78,7 @@ /* clip first point on top */ if (*y1 < miny) { if (*y2 < miny) - return false; + return pcb_false; d = *y2 - *y1; r = (miny - *y1) / d; *y1 = miny; @@ -94,7 +94,7 @@ /* clip first point on bottom */ if (*y1 > maxy) { if (*y2 > maxy) - return false; + return pcb_false; d = *y2 - *y1; r = (maxy - *y1) / d; *y1 = maxy; @@ -107,5 +107,5 @@ *y2 = maxy; *x2 += r * (*x1 - *x2); } - return true; + return pcb_true; } Index: trunk/src/clip.h =================================================================== --- trunk/src/clip.h (revision 3382) +++ trunk/src/clip.h (revision 3383) @@ -38,7 +38,7 @@ /* Clip X,Y to the given bounding box, plus a margin. Returns TRUE if there is something left to be drawn. */ -bool ClipLine(double minx, double miny, double maxx, double maxy, +pcb_bool ClipLine(double minx, double miny, double maxx, double maxy, double *x1, double *y1, double *x2, double *y2, double margin); #endif Index: trunk/src/conf.c =================================================================== --- trunk/src/conf.c (revision 3382) +++ trunk/src/conf.c (revision 3383) @@ -204,7 +204,7 @@ val = lht_dom_hash_get(node, #field); \ if (val != NULL) {\ if (val->type == LHT_TEXT) {\ - bool succ; \ + pcb_bool succ; \ inc->field = GetValue(val->data.text.value, NULL, NULL, &succ); \ if (!succ) \ hid_cfg_error(node, "invalid numeric value in increment field " #field ": %s\n", val->data.text.value); \ @@ -327,7 +327,7 @@ return -1; case CFN_COORD: { - bool succ; + pcb_bool succ; dst->coord[idx] = GetValue(text, NULL, NULL, &succ); if (!succ) hid_cfg_error(err_node, "Invalid numeric value (coordinate): %s\n", text); Index: trunk/src/copy.c =================================================================== --- trunk/src/copy.c (revision 3382) +++ trunk/src/copy.c (revision 3383) @@ -103,7 +103,7 @@ * if necessary */ ElementTypePtr -CopyElementLowLevel(DataTypePtr Data, ElementTypePtr Dest, ElementTypePtr Src, bool uniqueName, Coord dx, Coord dy) +CopyElementLowLevel(DataTypePtr Data, ElementTypePtr Dest, ElementTypePtr Src, pcb_bool uniqueName, Coord dx, Coord dy) { int i; /* release old memory if necessary */ @@ -278,10 +278,10 @@ * pastes the contents of the buffer to the layout. Only visible objects * are handled by the routine. */ -bool CopyPastebufferToLayout(Coord X, Coord Y) +pcb_bool CopyPastebufferToLayout(Coord X, Coord Y) { Cardinal i; - bool changed = false; + pcb_bool changed = pcb_false; #ifdef DEBUG printf("Entering CopyPastebufferToLayout.....\n"); @@ -328,7 +328,7 @@ #endif if (FRONT(element) || PCB->InvisibleObjectsOn) { CopyElement(element); - changed = true; + changed = pcb_true; } } END_LOOP; Index: trunk/src/copy.h =================================================================== --- trunk/src/copy.h (revision 3382) +++ trunk/src/copy.h (revision 3383) @@ -40,8 +40,8 @@ PolygonTypePtr CopyPolygonLowLevel(PolygonTypePtr, PolygonTypePtr); -ElementTypePtr CopyElementLowLevel(DataTypePtr, ElementTypePtr, ElementTypePtr, bool, Coord, Coord); -bool CopyPastebufferToLayout(Coord, Coord); +ElementTypePtr CopyElementLowLevel(DataTypePtr, ElementTypePtr, ElementTypePtr, pcb_bool, Coord, Coord); +pcb_bool CopyPastebufferToLayout(Coord, Coord); void *CopyObject(int, void *, void *, void *, Coord, Coord); #endif Index: trunk/src/create.c =================================================================== --- trunk/src/create.c (revision 3382) +++ trunk/src/create.c (revision 3383) @@ -57,7 +57,7 @@ /* current object ID; incremented after each creation of an object */ static long int ID = 1; -static bool be_lenient = false; +static pcb_bool be_lenient = pcb_false; /* ---------------------------------------------------------------------- * some local prototypes @@ -68,7 +68,7 @@ * Set the lenience mode. */ -void CreateBeLenient(bool v) +void CreateBeLenient(pcb_bool v) { be_lenient = v; } @@ -122,7 +122,7 @@ /* --------------------------------------------------------------------------- * creates a new PCB */ -PCBTypePtr CreateNewPCB_(bool SetDefaultNames) +PCBTypePtr CreateNewPCB_(pcb_bool SetDefaultNames) { PCBTypePtr ptr, save; int i; @@ -134,8 +134,8 @@ ptr->ThermStyle = 4; ptr->IsleArea = 2.e8; - ptr->SilkActive = false; - ptr->RatDraw = false; + ptr->SilkActive = pcb_false; + ptr->RatDraw = pcb_false; /* NOTE: we used to set all the pcb flags on ptr here, but we don't need to do that anymore due to the new conf system */ /* this is the most useful starting point for now */ @@ -177,7 +177,7 @@ PCB = NULL; dpcb = -1; - conf_list_foreach_path_first(dpcb, &conf_core.rc.default_pcb_file, LoadPCB(__path__, NULL, false, 1)); + conf_list_foreach_path_first(dpcb, &conf_core.rc.default_pcb_file, LoadPCB(__path__, NULL, pcb_false, 1)); if (dpcb == 0) { nw = PCB; @@ -622,7 +622,7 @@ FontTypePtr PCBFont, FlagType Flags, char *Description, char *NameOnPCB, char *Value, - Coord TextX, Coord TextY, BYTE Direction, int TextScale, FlagType TextFlags, bool uniqueName) + Coord TextX, Coord TextY, BYTE Direction, int TextScale, FlagType TextFlags, pcb_bool uniqueName) { #ifdef DEBUG printf("Entered CreateNewElement.....\n"); Index: trunk/src/create.h =================================================================== --- trunk/src/create.h (revision 3382) +++ trunk/src/create.h (revision 3383) @@ -34,11 +34,11 @@ /* TRUE during file loads, for example to allow overlapping vias. FALSE otherwise, to stop the user from doing normally dangerous things. */ -void CreateBeLenient(bool); +void CreateBeLenient(pcb_bool); DataTypePtr CreateNewBuffer(void); void pcb_colors_from_settings(PCBTypePtr); -PCBTypePtr CreateNewPCB_(bool); +PCBTypePtr CreateNewPCB_(pcb_bool); PCBTypePtr CreateNewPCB(); /* Called after PCB->Data->LayerN is set. Returns zero if no errors, else nonzero. */ @@ -54,7 +54,7 @@ PointTypePtr CreateNewPointInPolygon(PolygonTypePtr, Coord, Coord); PolygonType *CreateNewHoleInPolygon(PolygonType * polygon); ElementTypePtr CreateNewElement(DataTypePtr, ElementTypePtr, - FontTypePtr, FlagType, char *, char *, char *, Coord, Coord, BYTE, int, FlagType, bool); + FontTypePtr, FlagType, char *, char *, char *, Coord, Coord, BYTE, int, FlagType, pcb_bool); LineTypePtr CreateNewLineInElement(ElementTypePtr, Coord, Coord, Coord, Coord, Coord); ArcTypePtr CreateNewArcInElement(ElementTypePtr, Coord, Coord, Coord, Coord, Angle, Angle, Coord); PinTypePtr CreateNewPin(ElementTypePtr, Coord, Coord, Coord, Coord, Coord, Coord, char *, char *, FlagType); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 3382) +++ trunk/src/crosshair.c (revision 3383) @@ -71,7 +71,7 @@ moved_pv.X += x; moved_pv.Y += y; - gui->thindraw_pcb_pv(Crosshair.GC, Crosshair.GC, &moved_pv, true, false); + gui->thindraw_pcb_pv(Crosshair.GC, Crosshair.GC, &moved_pv, pcb_true, pcb_false); } static void draw_dashed_line(hidGC GC, Coord x1, Coord y1, Coord x2, Coord y2) @@ -259,7 +259,7 @@ moved_pad.Point2.X += DX; moved_pad.Point2.Y += DY; - gui->thindraw_pcb_pad(Crosshair.GC, &moved_pad, false, false); + gui->thindraw_pcb_pad(Crosshair.GC, &moved_pad, pcb_false, pcb_false); } } END_LOOP; @@ -504,13 +504,13 @@ via.Mask = 0; via.Flags = NoFlags(); - gui->thindraw_pcb_pv(Crosshair.GC, Crosshair.GC, &via, true, false); + gui->thindraw_pcb_pv(Crosshair.GC, Crosshair.GC, &via, pcb_true, pcb_false); if (conf_core.editor.show_drc) { /* XXX: Naughty cheat - use the mask to draw DRC clearance! */ via.Mask = conf_core.design.via_thickness + PCB->Bloat * 2; gui->set_color(Crosshair.GC, conf_core.appearance.color.cross); - gui->thindraw_pcb_pv(Crosshair.GC, Crosshair.GC, &via, false, true); + gui->thindraw_pcb_pv(Crosshair.GC, Crosshair.GC, &via, pcb_false, pcb_true); gui->set_color(Crosshair.GC, conf_core.appearance.color.crosshair); } break; @@ -627,19 +627,19 @@ /* --------------------------------------------------------------------------- * notify the GUI that data relating to the crosshair is being changed. * - * The argument passed is false to notify "changes are about to happen", - * and true to notify "changes have finished". + * The argument passed is pcb_false to notify "changes are about to happen", + * and pcb_true to notify "changes have finished". * - * Each call with a 'false' parameter must be matched with a following one - * with a 'true' parameter. Unmatched 'true' calls are currently not permitted, + * Each call with a 'pcb_false' parameter must be matched with a following one + * with a 'pcb_true' parameter. Unmatched 'pcb_true' calls are currently not permitted, * but might be allowed in the future. * - * GUIs should not complain if they receive extra calls with 'true' as parameter. + * GUIs should not complain if they receive extra calls with 'pcb_true' as parameter. * They should initiate a redraw of the crosshair attached objects - which may * (if necessary) mean repainting the whole screen if the GUI hasn't tracked the * location of existing attached drawing. */ -void notify_crosshair_change(bool changes_complete) +void notify_crosshair_change(pcb_bool changes_complete) { if (gui->notify_crosshair_change) gui->notify_crosshair_change(changes_complete); @@ -649,18 +649,18 @@ /* --------------------------------------------------------------------------- * notify the GUI that data relating to the mark is being changed. * - * The argument passed is false to notify "changes are about to happen", - * and true to notify "changes have finished". + * The argument passed is pcb_false to notify "changes are about to happen", + * and pcb_true to notify "changes have finished". * - * Each call with a 'false' parameter must be matched with a following one - * with a 'true' parameter. Unmatched 'true' calls are currently not permitted, + * Each call with a 'pcb_false' parameter must be matched with a following one + * with a 'pcb_true' parameter. Unmatched 'pcb_true' calls are currently not permitted, * but might be allowed in the future. * - * GUIs should not complain if they receive extra calls with 'true' as parameter. + * GUIs should not complain if they receive extra calls with 'pcb_true' as parameter. * They should initiate a redraw of the mark - which may (if necessary) mean * repainting the whole screen if the GUI hasn't tracked the mark's location. */ -void notify_mark_change(bool changes_complete) +void notify_mark_change(pcb_bool changes_complete) { if (gui->notify_mark_change) gui->notify_mark_change(changes_complete); @@ -679,28 +679,28 @@ */ void HideCrosshair(void) { - static bool warned_old_api = false; + static pcb_bool warned_old_api = pcb_false; if (!warned_old_api) { Message(PCB_MSG_DEFAULT, _("WARNING: A plugin is using the deprecated API HideCrosshair().\n" " This API may be removed in a future release of PCB.\n")); - warned_old_api = true; + warned_old_api = pcb_true; } - notify_crosshair_change(false); - notify_mark_change(false); + notify_crosshair_change(pcb_false); + notify_mark_change(pcb_false); } void RestoreCrosshair(void) { - static bool warned_old_api = false; + static pcb_bool warned_old_api = pcb_false; if (!warned_old_api) { Message(PCB_MSG_DEFAULT, _("WARNING: A plugin is using the deprecated API RestoreCrosshair().\n" " This API may be removed in a future release of PCB.\n")); - warned_old_api = true; + warned_old_api = pcb_true; } - notify_crosshair_change(true); - notify_mark_change(true); + notify_crosshair_change(pcb_true); + notify_mark_change(pcb_true); } /* @@ -818,7 +818,7 @@ BoxType SearchBox = point_box(X, Y); struct onpoint_search_info info; int i; - bool redraw = false; + pcb_bool redraw = pcb_false; op_swap(crosshair); @@ -850,7 +850,7 @@ CLEAR_FLAG(PCB_FLAG_ONPOINT, (AnyObjectType *) op->obj.any); DrawLineOrArc(op->type, op->obj.any); - redraw = true; + redraw = pcb_true; } /* draw the new objects */ @@ -861,7 +861,7 @@ if (onpoint_find(&crosshair->old_onpoint_objs, op->obj.any) != NULL) continue; DrawLineOrArc(op->type, op->obj.any); - redraw = true; + redraw = pcb_true; } if (redraw) { @@ -885,7 +885,7 @@ struct snap_data { CrosshairType *crosshair; double nearest_sq_dist; - bool nearest_is_grid; + pcb_bool nearest_is_grid; Coord x, y; }; @@ -895,7 +895,7 @@ * pressing the SHIFT key. If the SHIFT key is pressed, the closest object * (including grid points), is always preferred. */ -static void check_snap_object(struct snap_data *snap_data, Coord x, Coord y, bool prefer_to_grid) +static void check_snap_object(struct snap_data *snap_data, Coord x, Coord y, pcb_bool prefer_to_grid) { double sq_dist; @@ -904,7 +904,7 @@ snap_data->x = x; snap_data->y = y; snap_data->nearest_sq_dist = sq_dist; - snap_data->nearest_is_grid = false; + snap_data->nearest_is_grid = pcb_false; } } @@ -949,7 +949,7 @@ /* Move in the X direction until we hit the line */ try_x = (nearest_grid_y - line->Point1.Y) / dy * dx + line->Point1.X; try_y = nearest_grid_y; - check_snap_object(snap_data, try_x, try_y, true); + check_snap_object(snap_data, try_x, try_y, pcb_true); } /* Try snapping along the Y axis */ @@ -956,7 +956,7 @@ if (dx != 0.) { try_x = nearest_grid_x; try_y = (nearest_grid_x - line->Point1.X) / dx * dy + line->Point1.Y; - check_snap_object(snap_data, try_x, try_y, true); + check_snap_object(snap_data, try_x, try_y, pcb_true); } if (dx != dy) { /* If line not parallel with dX = dY direction.. */ @@ -970,7 +970,7 @@ try_x = nearest_grid_x + dist; try_y = nearest_grid_y + dist; - check_snap_object(snap_data, try_x, try_y, true); + check_snap_object(snap_data, try_x, try_y, pcb_true); } if (dx != -dy) { /* If line not parallel with dX = -dY direction.. */ @@ -984,7 +984,7 @@ try_x = nearest_grid_x + dist; try_y = nearest_grid_y - dist; - check_snap_object(snap_data, try_x, try_y, true); + check_snap_object(snap_data, try_x, try_y, pcb_true); } } @@ -1022,7 +1022,7 @@ snap_data.crosshair = &Crosshair; snap_data.nearest_sq_dist = crosshair_sq_dist(&Crosshair, nearest_grid_x, nearest_grid_y); - snap_data.nearest_is_grid = true; + snap_data.nearest_is_grid = pcb_true; snap_data.x = nearest_grid_x; snap_data.y = nearest_grid_y; @@ -1032,7 +1032,7 @@ if (ans & PCB_TYPE_ELEMENT) { ElementType *el = (ElementType *) ptr1; - check_snap_object(&snap_data, el->MarkX, el->MarkY, false); + check_snap_object(&snap_data, el->MarkX, el->MarkY, pcb_false); } ans = PCB_TYPE_NONE; @@ -1050,7 +1050,7 @@ LayerType *desired_layer; Cardinal desired_group; Cardinal SLayer, CLayer; - int found_our_layer = false; + int found_our_layer = pcb_false; desired_layer = CURRENT; if (conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT) { @@ -1065,19 +1065,19 @@ GROUP_LOOP(PCB->Data, desired_group); { if (layer == desired_layer) { - found_our_layer = true; + found_our_layer = pcb_true; break; } } END_LOOP; - if (found_our_layer == false) + if (found_our_layer == pcb_false) ans = PCB_TYPE_NONE; } if (ans != PCB_TYPE_NONE) { PadType *pad = (PadType *) ptr2; - check_snap_object(&snap_data, (pad->Point1.X + pad->Point2.X) / 2, (pad->Point1.Y + pad->Point2.Y) / 2, true); + check_snap_object(&snap_data, (pad->Point1.X + pad->Point2.X) / 2, (pad->Point1.Y + pad->Point2.Y) / 2, pcb_true); } ans = PCB_TYPE_NONE; @@ -1091,7 +1091,7 @@ if (ans != PCB_TYPE_NONE) { PinType *pin = (PinType *) ptr2; - check_snap_object(&snap_data, pin->X, pin->Y, true); + check_snap_object(&snap_data, pin->X, pin->Y, pcb_true); } ans = PCB_TYPE_NONE; @@ -1104,7 +1104,7 @@ if (ans != PCB_TYPE_NONE) { PinType *pin = (PinType *) ptr2; - check_snap_object(&snap_data, pin->X, pin->Y, true); + check_snap_object(&snap_data, pin->X, pin->Y, pcb_true); } ans = PCB_TYPE_NONE; @@ -1113,7 +1113,7 @@ if (ans != PCB_TYPE_NONE) { PointType *pnt = (PointType *) ptr3; - check_snap_object(&snap_data, pnt->X, pnt->Y, true); + check_snap_object(&snap_data, pnt->X, pnt->Y, pcb_true); } /* @@ -1128,7 +1128,7 @@ if (ans != PCB_TYPE_NONE) { PointType *pnt = (PointType *) ptr3; - check_snap_object(&snap_data, pnt->X, pnt->Y, true); + check_snap_object(&snap_data, pnt->X, pnt->Y, pcb_true); } if (snap_data.x >= 0 && snap_data.y >= 0) { @@ -1163,9 +1163,9 @@ /* --------------------------------------------------------------------------- * move crosshair absolute - * return true if the crosshair was moved from its existing position + * return pcb_true if the crosshair was moved from its existing position */ -bool MoveCrosshairAbsolute(Coord X, Coord Y) +pcb_bool MoveCrosshairAbsolute(Coord X, Coord Y) { Coord x, y, z; x = Crosshair.X; @@ -1179,13 +1179,13 @@ x = z; z = Crosshair.Y; Crosshair.Y = y; - notify_crosshair_change(false); /* Our caller notifies when it has done */ + notify_crosshair_change(pcb_false); /* Our caller notifies when it has done */ /* now move forward again */ Crosshair.X = x; Crosshair.Y = z; - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- @@ -1228,7 +1228,7 @@ memset(&Crosshair.old_onpoint_objs, 0, sizeof(vtop_t)); /* clear the mark */ - Marked.status = false; + Marked.status = pcb_false; } /* --------------------------------------------------------------------------- Index: trunk/src/crosshair.h =================================================================== --- trunk/src/crosshair.h (revision 3382) +++ trunk/src/crosshair.h (revision 3383) @@ -39,14 +39,14 @@ #define STATE_THIRD 2 Coord GridFit(Coord x, Coord grid_spacing, Coord grid_offset); -void notify_crosshair_change(bool changes_complete); -void notify_mark_change(bool changes_complete); +void notify_crosshair_change(pcb_bool changes_complete); +void notify_mark_change(pcb_bool changes_complete); void HideCrosshair(void); void RestoreCrosshair(void); void DrawAttached(void); void DrawMark(void); void MoveCrosshairRelative(Coord, Coord); -bool MoveCrosshairAbsolute(Coord, Coord); +pcb_bool MoveCrosshairAbsolute(Coord, Coord); void SetCrosshairRange(Coord, Coord, Coord, Coord); void InitCrosshair(void); void DestroyCrosshair(void); Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 3382) +++ trunk/src/data.c (revision 3383) @@ -41,8 +41,8 @@ int LayerStack[MAX_LAYER]; /* determines the layer draw order */ -BufferType Buffers[MAX_BUFFER]; /* my buffers */ -bool Bumped; /* if the undo serial number has changed */ +BufferType Buffers[MAX_BUFFER]; /* my buffers */ +pcb_bool Bumped; /* if the undo serial number has changed */ int addedLines; Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 3382) +++ trunk/src/data.h (revision 3383) @@ -58,7 +58,7 @@ extern int addedLines; extern int LayerStack[MAX_LAYER]; -extern bool Bumped; +extern pcb_bool Bumped; extern FlagType no_flags; Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 3382) +++ trunk/src/draw.c (revision 3383) @@ -60,7 +60,7 @@ static BoxType Block = { MAXINT, MAXINT, -MAXINT, -MAXINT }; static int doing_pinout = 0; -static bool doing_assy = false; +static pcb_bool doing_assy = pcb_false; /* --------------------------------------------------------------------------- * some local prototypes @@ -70,7 +70,7 @@ static void DrawLayerGroup(int, const BoxType *); static void AddPart(void *); static void SetPVColor(PinTypePtr, int); -static void DrawEMark(ElementTypePtr, Coord, Coord, bool); +static void DrawEMark(ElementTypePtr, Coord, Coord, pcb_bool); static void DrawMask(int side, const BoxType *); static void DrawPaste(int side, const BoxType *); static void DrawRats(const BoxType *); @@ -180,7 +180,7 @@ static void _draw_pv_name(PinType * pv) { BoxType box; - bool vert; + pcb_bool vert; TextType text; char buff[128]; const char *pn; @@ -223,18 +223,18 @@ doing_pinout--; } -static void _draw_pv(PinTypePtr pv, bool draw_hole) +static void _draw_pv(PinTypePtr pv, pcb_bool draw_hole) { if (conf_core.editor.thin_draw) - gui->thindraw_pcb_pv(Output.fgGC, Output.fgGC, pv, draw_hole, false); + gui->thindraw_pcb_pv(Output.fgGC, Output.fgGC, pv, draw_hole, pcb_false); else - gui->fill_pcb_pv(Output.fgGC, Output.bgGC, pv, draw_hole, false); + gui->fill_pcb_pv(Output.fgGC, Output.bgGC, pv, draw_hole, pcb_false); if (!TEST_FLAG(PCB_FLAG_HOLE, pv) && TEST_FLAG(PCB_FLAG_DISPLAYNAME, pv)) _draw_pv_name(pv); } -static void draw_pin(PinTypePtr pin, bool draw_hole) +static void draw_pin(PinTypePtr pin, pcb_bool draw_hole) { SetPVColor(pin, PCB_TYPE_PIN); _draw_pv(pin, draw_hole); @@ -242,11 +242,11 @@ static r_dir_t pin_callback(const BoxType * b, void *cl) { - draw_pin((PinType *) b, false); + draw_pin((PinType *) b, pcb_false); return R_DIR_FOUND_CONTINUE; } -static void draw_via(PinTypePtr via, bool draw_hole) +static void draw_via(PinTypePtr via, pcb_bool draw_hole) { SetPVColor(via, PCB_TYPE_VIA); _draw_pv(via, draw_hole); @@ -254,7 +254,7 @@ static r_dir_t via_callback(const BoxType * b, void *cl) { - draw_via((PinType *) b, false); + draw_via((PinType *) b, pcb_false); return R_DIR_FOUND_CONTINUE; } @@ -261,7 +261,7 @@ static void draw_pad_name(PadType * pad) { BoxType box; - bool vert; + pcb_bool vert; TextType text; char buff[128]; const char *pn; @@ -305,7 +305,7 @@ DrawTextLowLevel(&text, 0); } -static void _draw_pad(hidGC gc, PadType * pad, bool clear, bool mask) +static void _draw_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) { if (clear && !mask && pad->Clearance <= 0) return; @@ -345,7 +345,7 @@ if (color != NULL) gui->set_color(Output.fgGC, color); - _draw_pad(Output.fgGC, pad, false, false); + _draw_pad(Output.fgGC, pad, pcb_false, pcb_false); if (doing_pinout || TEST_FLAG(PCB_FLAG_DISPLAYNAME, pad)) draw_pad_name(pad); @@ -407,7 +407,7 @@ END_LOOP; PIN_LOOP(element); { - draw_pin(pin, true); + draw_pin(pin, pcb_true); } END_LOOP; } @@ -462,7 +462,7 @@ return R_DIR_FOUND_CONTINUE; } -static void DrawHoles(bool draw_plated, bool draw_unplated, const BoxType * drawn_area) +static void DrawHoles(pcb_bool draw_plated, pcb_bool draw_unplated, const BoxType * drawn_area) { int plated = -1; @@ -636,7 +636,7 @@ { int side_group = GetLayerGroupNumberByNumber(max_copper_layer + side); - doing_assy = true; + doing_assy = pcb_true; gui->set_draw_faded(Output.fgGC, 1); DrawLayerGroup(side_group, drawn_area); gui->set_draw_faded(Output.fgGC, 0); @@ -643,7 +643,7 @@ /* draw package */ DrawSilk(side, drawn_area); - doing_assy = false; + doing_assy = pcb_false; } /* --------------------------------------------------------------------------- @@ -658,7 +658,7 @@ /* This is the reverse of the order in which we draw them. */ int drawn_groups[MAX_LAYER]; int plated, unplated; - bool paste_empty; + pcb_bool paste_empty; PCB->Data->SILKLAYER.Color = PCB->ElementColor; PCB->Data->BACKSILKLAYER.Color = PCB->InvisibleObjectsColor; @@ -711,12 +711,12 @@ CountHoles(&plated, &unplated, drawn_area); if (plated && gui->set_layer("plated-drill", SL(PDRILL, 0), 0)) { - DrawHoles(true, false, drawn_area); + DrawHoles(pcb_true, pcb_false, drawn_area); gui->end_layer(); } if (unplated && gui->set_layer("unplated-drill", SL(UDRILL, 0), 0)) { - DrawHoles(false, true, drawn_area); + DrawHoles(pcb_false, pcb_true, drawn_area); gui->end_layer(); } } @@ -781,7 +781,7 @@ } } -static void DrawEMark(ElementTypePtr e, Coord X, Coord Y, bool invisible) +static void DrawEMark(ElementTypePtr e, Coord X, Coord Y, pcb_bool invisible) { Coord mark_size = EMARK_SIZE; if (!PCB->InvisibleObjectsOn && invisible) @@ -858,9 +858,9 @@ { PinType *pin = (PinTypePtr) b; if (conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) - gui->thindraw_pcb_pv(Output.pmGC, Output.pmGC, pin, false, true); + gui->thindraw_pcb_pv(Output.pmGC, Output.pmGC, pin, pcb_false, pcb_true); else - gui->fill_pcb_pv(Output.pmGC, Output.pmGC, pin, false, true); + gui->fill_pcb_pv(Output.pmGC, Output.pmGC, pin, pcb_false, pcb_true); return R_DIR_FOUND_CONTINUE; } @@ -915,7 +915,7 @@ PadTypePtr pad = (PadTypePtr) b; int *side = cl; if (ON_SIDE(pad, *side) && pad->Mask) - _draw_pad(Output.pmGC, pad, true, true); + _draw_pad(Output.pmGC, pad, pcb_true, pcb_true); return R_DIR_FOUND_CONTINUE; } @@ -1009,9 +1009,9 @@ { if (ON_SIDE(pad, side) && !TEST_FLAG(PCB_FLAG_NOPASTE, pad) && pad->Mask > 0) { if (pad->Mask < pad->Thickness) - _draw_pad(Output.fgGC, pad, true, true); + _draw_pad(Output.fgGC, pad, pcb_true, pcb_true); else - _draw_pad(Output.fgGC, pad, false, false); + _draw_pad(Output.fgGC, pad, pcb_false, pcb_false); } } ENDALL_LOOP; @@ -1114,7 +1114,7 @@ static void GatherPVName(PinTypePtr Ptr) { BoxType box; - bool vert = TEST_FLAG(PCB_FLAG_EDGE2, Ptr); + pcb_bool vert = TEST_FLAG(PCB_FLAG_EDGE2, Ptr); if (vert) { box.X1 = Ptr->X - Ptr->Thickness / 2 + conf_core.appearance.pinout.text_offset_y; @@ -1139,7 +1139,7 @@ static void GatherPadName(PadTypePtr Pad) { BoxType box; - bool vert; + pcb_bool vert; /* should text be vertical ? */ vert = (Pad->Point1.X == Pad->Point2.X); @@ -1695,9 +1695,9 @@ hid->set_color(Output.bgGC, "drill"); if (item) { - doing_pinout = true; + doing_pinout = pcb_true; draw_element((ElementType *) item); - doing_pinout = false; + doing_pinout = pcb_false; } else DrawEverything(region); Index: trunk/src/draw.h =================================================================== --- trunk/src/draw.h (revision 3382) +++ trunk/src/draw.h (revision 3383) @@ -31,8 +31,6 @@ #include "global.h" -/*bool SwitchDrawingWindow(double, GdkDrawable *, gboolean, gboolean);*/ - void Draw(void); void Redraw(void); void DrawVia(PinTypePtr); Index: trunk/src/drill.c =================================================================== --- trunk/src/drill.c (revision 3382) +++ trunk/src/drill.c (revision 3383) @@ -99,14 +99,14 @@ DrillInfoTypePtr AllDrills; DrillTypePtr Drill = NULL; DrillType savedrill, swapdrill; - bool DrillFound = false; - bool NewDrill; + pcb_bool DrillFound = pcb_false; + pcb_bool NewDrill; AllDrills = (DrillInfoTypePtr) calloc(1, sizeof(DrillInfoType)); ALLPIN_LOOP(top); { if (!DrillFound) { - DrillFound = true; + DrillFound = pcb_true; Drill = GetDrillInfoDrillMemory(AllDrills); InitializeDrill(Drill, pin, element); } @@ -114,7 +114,7 @@ if (Drill->DrillSize == pin->DrillingHole) FillDrill(Drill, element, pin); else { - NewDrill = false; + NewDrill = pcb_false; DRILL_LOOP(AllDrills); { if (drill->DrillSize == pin->DrillingHole) { @@ -124,7 +124,7 @@ } else if (drill->DrillSize > pin->DrillingHole) { if (!NewDrill) { - NewDrill = true; + NewDrill = pcb_true; InitializeDrill(&swapdrill, pin, element); Drill = GetDrillInfoDrillMemory(AllDrills); Drill->DrillSize = pin->DrillingHole + 1; @@ -147,7 +147,7 @@ VIA_LOOP(top); { if (!DrillFound) { - DrillFound = true; + DrillFound = pcb_true; Drill = GetDrillInfoDrillMemory(AllDrills); Drill->DrillSize = via->DrillingHole; FillDrill(Drill, NULL, via); Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 3382) +++ trunk/src/file_act.c (revision 3383) @@ -121,22 +121,22 @@ format = argv[2]; if (strcasecmp(function, "ElementToBuffer") == 0) { - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); if (LoadElementToBuffer(PASTEBUFFER, name)) SetMode(PCB_MODE_PASTE_BUFFER); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); } else if (strcasecmp(function, "LayoutToBuffer") == 0) { - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); if (LoadLayoutToBuffer(PASTEBUFFER, name, format)) SetMode(PCB_MODE_PASTE_BUFFER); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); } else if (strcasecmp(function, "Layout") == 0) { if (!PCB->Changed || gui->confirm_dialog(_("OK to override layout data?"), 0)) - LoadPCB(name, format, true, 0); + LoadPCB(name, format, pcb_true, 0); } else if (strcasecmp(function, "Netlist") == 0) { @@ -185,7 +185,7 @@ if (!name) return 1; - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); /* do emergency saving * clear the old struct and allocate memory for the new one */ @@ -205,7 +205,7 @@ Redraw(); hid_action("PCBChanged"); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } return 1; @@ -256,7 +256,7 @@ if (strcasecmp(function, "Layout") == 0) { if (SavePCB(PCB->Filename, NULL) == 0) - SetChangedFlag(false); + SetChangedFlag(pcb_false); if (gui->notify_filename_changed != NULL) gui->notify_filename_changed(); return 0; @@ -270,7 +270,7 @@ if (strcasecmp(function, "LayoutAs") == 0) { if (SavePCB(name, fmt) == 0) { - SetChangedFlag(false); + SetChangedFlag(pcb_false); free(PCB->Filename); PCB->Filename = pcb_strdup(name); if (gui->notify_filename_changed != NULL) @@ -281,11 +281,11 @@ if (strcasecmp(function, "AllConnections") == 0) { FILE *fp; - bool result; - if ((fp = CheckAndOpenFile(name, true, false, &result, NULL)) != NULL) { + pcb_bool result; + if ((fp = CheckAndOpenFile(name, pcb_true, pcb_false, &result, NULL)) != NULL) { LookupConnectionsToAllElements(fp); fclose(fp); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } return 0; } @@ -292,11 +292,11 @@ if (strcasecmp(function, "AllUnusedPins") == 0) { FILE *fp; - bool result; - if ((fp = CheckAndOpenFile(name, true, false, &result, NULL)) != NULL) { + pcb_bool result; + if ((fp = CheckAndOpenFile(name, pcb_true, pcb_false, &result, NULL)) != NULL) { LookupUnusedPins(fp); fclose(fp); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } return 0; } @@ -305,14 +305,14 @@ ElementTypePtr element; void *ptrtmp; FILE *fp; - bool result; + pcb_bool result; if ((SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { element = (ElementTypePtr) ptrtmp; - if ((fp = CheckAndOpenFile(name, true, false, &result, NULL)) != NULL) { + if ((fp = CheckAndOpenFile(name, pcb_true, pcb_false, &result, NULL)) != NULL) { LookupElementConnections(element, fp); fclose(fp); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } } return 0; Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 3382) +++ trunk/src/find.c (revision 3383) @@ -138,9 +138,9 @@ find_callback(current_type, current_ptr, from_type, from_ptr, type); \ } while(0) -static bool User = false; /* user action causing this */ -static bool drc = false; /* whether to stop if finding something not found */ -static bool IsBad = false; +static pcb_bool User = pcb_false; /* user action causing this */ +static pcb_bool drc = pcb_false; /* whether to stop if finding something not found */ +static pcb_bool IsBad = pcb_false; static Cardinal drcerr_count; /* count of drc errors */ static Cardinal TotalP, TotalV, NumberOfPads[2]; static ListType LineList[MAX_LAYER], /* list of objects to */ @@ -149,28 +149,28 @@ /* --------------------------------------------------------------------------- * some local prototypes */ -static bool LookupLOConnectionsToPVList(bool); -static bool LookupLOConnectionsToLOList(bool); -static bool LookupPVConnectionsToLOList(bool); -static bool LookupPVConnectionsToPVList(void); -static bool LookupLOConnectionsToLine(LineTypePtr, Cardinal, bool); -static bool LookupLOConnectionsToPad(PadTypePtr, Cardinal); -static bool LookupLOConnectionsToPolygon(PolygonTypePtr, Cardinal); -static bool LookupLOConnectionsToArc(ArcTypePtr, Cardinal); -static bool LookupLOConnectionsToRatEnd(PointTypePtr, Cardinal); -static bool IsRatPointOnLineEnd(PointTypePtr, LineTypePtr); -static bool ArcArcIntersect(ArcTypePtr, ArcTypePtr); -static bool PrintElementConnections(ElementTypePtr, FILE *, bool); -static bool ListsEmpty(bool); -static bool DoIt(bool, bool); +static pcb_bool LookupLOConnectionsToPVList(pcb_bool); +static pcb_bool LookupLOConnectionsToLOList(pcb_bool); +static pcb_bool LookupPVConnectionsToLOList(pcb_bool); +static pcb_bool LookupPVConnectionsToPVList(void); +static pcb_bool LookupLOConnectionsToLine(LineTypePtr, Cardinal, pcb_bool); +static pcb_bool LookupLOConnectionsToPad(PadTypePtr, Cardinal); +static pcb_bool LookupLOConnectionsToPolygon(PolygonTypePtr, Cardinal); +static pcb_bool LookupLOConnectionsToArc(ArcTypePtr, Cardinal); +static pcb_bool LookupLOConnectionsToRatEnd(PointTypePtr, Cardinal); +static pcb_bool IsRatPointOnLineEnd(PointTypePtr, LineTypePtr); +static pcb_bool ArcArcIntersect(ArcTypePtr, ArcTypePtr); +static pcb_bool PrintElementConnections(ElementTypePtr, FILE *, pcb_bool); +static pcb_bool ListsEmpty(pcb_bool); +static pcb_bool DoIt(pcb_bool, pcb_bool); static void PrintElementNameList(ElementTypePtr, FILE *); static void PrintConnectionElementName(ElementTypePtr, FILE *); -static void PrintConnectionListEntry(char *, ElementTypePtr, bool, FILE *); -static void PrintPadConnections(Cardinal, FILE *, bool); -static void PrintPinConnections(FILE *, bool); +static void PrintConnectionListEntry(char *, ElementTypePtr, pcb_bool, FILE *); +static void PrintPadConnections(Cardinal, FILE *, pcb_bool); +static void PrintPinConnections(FILE *, pcb_bool); static void DumpList(void); -static bool ListStart(int, void *, void *, void *); -static bool SetThing(int, void *, void *, void *); +static pcb_bool ListStart(int, void *, void *, void *); +static pcb_bool SetThing(int, void *, void *, void *); #include "find_geo.c" Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 3382) +++ trunk/src/find.h (revision 3383) @@ -60,19 +60,19 @@ #define SILK_TYPE \ (PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON) -bool LineLineIntersect(LineTypePtr, LineTypePtr); -bool LineArcIntersect(LineTypePtr, ArcTypePtr); -bool PinLineIntersect(PinTypePtr, LineTypePtr); -bool LinePadIntersect(LineTypePtr, PadTypePtr); -bool ArcPadIntersect(ArcTypePtr, PadTypePtr); -bool IsPolygonInPolygon(PolygonTypePtr, PolygonTypePtr); +pcb_bool LineLineIntersect(LineTypePtr, LineTypePtr); +pcb_bool LineArcIntersect(LineTypePtr, ArcTypePtr); +pcb_bool PinLineIntersect(PinTypePtr, LineTypePtr); +pcb_bool LinePadIntersect(LineTypePtr, PadTypePtr); +pcb_bool ArcPadIntersect(ArcTypePtr, PadTypePtr); +pcb_bool IsPolygonInPolygon(PolygonTypePtr, PolygonTypePtr); void LookupElementConnections(ElementTypePtr, FILE *); void LookupConnectionsToAllElements(FILE *); -void LookupConnection(Coord, Coord, bool, Coord, int); +void LookupConnection(Coord, Coord, pcb_bool, Coord, int); void LookupUnusedPins(FILE *); -bool ResetFoundLinesAndPolygons(bool); -bool ResetFoundPinsViasAndPads(bool); -bool ResetConnections(bool); +pcb_bool ResetFoundLinesAndPolygons(pcb_bool); +pcb_bool ResetFoundPinsViasAndPads(pcb_bool); +pcb_bool ResetConnections(pcb_bool); void InitConnectionLookup(void); void InitComponentLookup(void); void InitLayoutLookup(void); @@ -79,12 +79,12 @@ void FreeConnectionLookupMemory(void); void FreeComponentLookupMemory(void); void FreeLayoutLookupMemory(void); -void RatFindHook(int, void *, void *, void *, bool, bool); +void RatFindHook(int, void *, void *, void *, pcb_bool, pcb_bool); void SaveFindFlag(int); void RestoreFindFlag(void); int DRCAll(void); -bool IsLineInPolygon(LineTypePtr, PolygonTypePtr); -bool IsArcInPolygon(ArcTypePtr, PolygonTypePtr); -bool IsPadInPolygon(PadTypePtr, PolygonTypePtr); +pcb_bool IsLineInPolygon(LineTypePtr, PolygonTypePtr); +pcb_bool IsArcInPolygon(ArcTypePtr, PolygonTypePtr); +pcb_bool IsPadInPolygon(PadTypePtr, PolygonTypePtr); #endif Index: trunk/src/find_deadcode.c =================================================================== --- trunk/src/find_deadcode.c (revision 3382) +++ trunk/src/find_deadcode.c (revision 3383) @@ -62,7 +62,7 @@ return 0; } -static bool PVTouchesLine(LineTypePtr line) +static pcb_bool PVTouchesLine(LineTypePtr line) { struct lo_info info; @@ -71,16 +71,16 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->via_tree, (BoxType *) & info.line, NULL, pv_touch_callback, &info, NULL); else - return true; + return pcb_true; if (setjmp(info.env) == 0) r_search(PCB->Data->pin_tree, (BoxType *) & info.line, NULL, pv_touch_callback, &info, NULL); else - return true; + return pcb_true; - return (false); + return (pcb_false); } -static bool LOTouchesLine(LineTypePtr Line, Cardinal LayerGroup) +static pcb_bool LOTouchesLine(LineTypePtr Line, Cardinal LayerGroup) { Cardinal entry; struct lo_info info; @@ -105,17 +105,17 @@ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->line_tree, (BoxType *) & info.line, NULL, LOT_Linecallback, &info, NULL); else - return (true); + return (pcb_true); if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->arc_tree, (BoxType *) & info.line, NULL, LOT_Arccallback, &info, NULL); else - return (true); + return (pcb_true); /* now check all polygons */ polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) { if (!TEST_FLAG(TheFlag, polygon) && IsLineInPolygon(Line, polygon)) - return (true); + return (pcb_true); } } else { @@ -124,22 +124,22 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->pad_tree, &info.line.BoundingBox, NULL, LOT_Padcallback, &info, NULL); else - return true; + return pcb_true; } } - return (false); + return (pcb_false); } -/* returns true if nothing un-found touches the passed line - * returns false if it would touch something not yet found +/* returns pcb_true if nothing un-found touches the passed line + * returns pcb_false if it would touch something not yet found * doesn't include rat-lines in the search */ -bool lineClear(LineTypePtr line, Cardinal group) +pcb_bool lineClear(LineTypePtr line, Cardinal group) { if (LOTouchesLine(line, group)) - return (false); + return (pcb_false); if (PVTouchesLine(line)) - return (false); - return (true); + return (pcb_false); + return (pcb_true); } Index: trunk/src/find_debug.c =================================================================== --- trunk/src/find_debug.c (revision 3382) +++ trunk/src/find_debug.c (revision 3383) @@ -55,7 +55,7 @@ /* --------------------------------------------------------------------------- * prints one {pin,pad,via}/element entry of connection lists */ -static void PrintConnectionListEntry(char *ObjName, ElementTypePtr Element, bool FirstOne, FILE * FP) +static void PrintConnectionListEntry(char *ObjName, ElementTypePtr Element, pcb_bool FirstOne, FILE * FP) { if (FirstOne) { fputc('\t', FP); @@ -77,7 +77,7 @@ * prints all found connections of a pads to file FP * the connections are stacked in 'PadList' */ -static void PrintPadConnections(Cardinal Layer, FILE * FP, bool IsFirst) +static void PrintPadConnections(Cardinal Layer, FILE * FP, pcb_bool IsFirst) { Cardinal i; PadTypePtr ptr; @@ -89,7 +89,7 @@ if (IsFirst) { ptr = PADLIST_ENTRY(Layer, 0); if (ptr != NULL) - PrintConnectionListEntry((char *) UNKNOWN(ptr->Name), NULL, true, FP); + PrintConnectionListEntry((char *) UNKNOWN(ptr->Name), NULL, pcb_true, FP); else printf("Skipping NULL ptr in 1st part of PrintPadConnections\n"); } @@ -100,7 +100,7 @@ for (i = IsFirst ? 1 : 0; i < PadList[Layer].Number; i++) { ptr = PADLIST_ENTRY(Layer, i); if (ptr != NULL) - PrintConnectionListEntry((char *) EMPTY(ptr->Name), (ElementTypePtr) ptr->Element, false, FP); + PrintConnectionListEntry((char *) EMPTY(ptr->Name), (ElementTypePtr) ptr->Element, pcb_false, FP); else printf("Skipping NULL ptr in 2nd part of PrintPadConnections\n"); } @@ -110,7 +110,7 @@ * prints all found connections of a pin to file FP * the connections are stacked in 'PVList' */ -static void PrintPinConnections(FILE * FP, bool IsFirst) +static void PrintPinConnections(FILE * FP, pcb_bool IsFirst) { Cardinal i; PinTypePtr pv; @@ -121,7 +121,7 @@ if (IsFirst) { /* the starting pin */ pv = PVLIST_ENTRY(0); - PrintConnectionListEntry((char *) EMPTY(pv->Name), NULL, true, FP); + PrintConnectionListEntry((char *) EMPTY(pv->Name), NULL, pcb_true, FP); } /* we maybe have to start with i=1 if we are handling the @@ -130,6 +130,6 @@ for (i = IsFirst ? 1 : 0; i < PVList.Number; i++) { /* get the elements name or assume that its a via */ pv = PVLIST_ENTRY(i); - PrintConnectionListEntry((char *) EMPTY(pv->Name), (ElementTypePtr) pv->Element, false, FP); + PrintConnectionListEntry((char *) EMPTY(pv->Name), (ElementTypePtr) pv->Element, pcb_false, FP); } } Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 3382) +++ trunk/src/find_drc.c (revision 3383) @@ -28,7 +28,7 @@ /* DRC related functions */ static void GotoError(void); -static bool DRCFind(int What, void *ptr1, void *ptr2, void *ptr3); +static pcb_bool DRCFind(int What, void *ptr1, void *ptr2, void *ptr3); static DrcViolationType * pcb_drc_violation_new(const char *title, @@ -35,7 +35,7 @@ const char *explanation, Coord x, Coord y, Angle angle, - bool have_measured, + pcb_bool have_measured, Coord measured_value, Coord required_value, int object_count, long int *object_id_list, int *object_type_list) { @@ -294,11 +294,11 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; return R_DIR_FOUND_CONTINUE; } IncrementUndoSerialNumber(); - Undo(true); + Undo(pcb_true); return R_DIR_NOT_FOUND; } @@ -320,7 +320,7 @@ reset_drc_dialog_message(); - IsBad = false; + IsBad = pcb_false; drcerr_count = 0; SaveStackAndVisibility(); ResetStackAndVisibility(); @@ -329,12 +329,12 @@ TheFlag = PCB_FLAG_FOUND | PCB_FLAG_DRC | PCB_FLAG_SELECTED; - if (ResetConnections(true)) { + if (ResetConnections(pcb_true)) { IncrementUndoSerialNumber(); Draw(); } - User = false; + User = pcb_false; ELEMENT_LOOP(PCB->Data); { @@ -342,7 +342,7 @@ { if (!TEST_FLAG(PCB_FLAG_DRC, pin) && DRCFind(PCB_TYPE_PIN, (void *) element, (void *) pin, (void *) pin)) { - IsBad = true; + IsBad = pcb_true; break; } } @@ -358,7 +358,7 @@ if (!TEST_FLAG(PCB_FLAG_DRC, pad) && DRCFind(PCB_TYPE_PAD, (void *) element, (void *) pad, (void *) pad)) { - IsBad = true; + IsBad = pcb_true; break; } } @@ -372,7 +372,7 @@ { if (!TEST_FLAG(PCB_FLAG_DRC, via) && DRCFind(PCB_TYPE_VIA, (void *) via, (void *) via, (void *) via)) { - IsBad = true; + IsBad = pcb_true; break; } } @@ -379,7 +379,7 @@ END_LOOP; TheFlag = (IsBad) ? PCB_FLAG_DRC : (PCB_FLAG_FOUND | PCB_FLAG_DRC | PCB_FLAG_SELECTED); - ResetConnections(false); + ResetConnections(pcb_false); TheFlag = PCB_FLAG_SELECTED; /* check minimum widths and polygon clearances */ if (!IsBad) { @@ -405,11 +405,11 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } IncrementUndoSerialNumber(); - Undo(false); + Undo(pcb_false); } } ENDALL_LOOP; @@ -436,11 +436,11 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } IncrementUndoSerialNumber(); - Undo(false); + Undo(pcb_false); } } ENDALL_LOOP; @@ -468,11 +468,11 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } IncrementUndoSerialNumber(); - Undo(false); + Undo(pcb_false); } if (pin->DrillingHole < PCB->minDrill) { AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); @@ -490,11 +490,11 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } IncrementUndoSerialNumber(); - Undo(false); + Undo(pcb_false); } } ENDALL_LOOP; @@ -521,11 +521,11 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } IncrementUndoSerialNumber(); - Undo(false); + Undo(pcb_false); } } ENDALL_LOOP; @@ -553,11 +553,11 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } IncrementUndoSerialNumber(); - Undo(false); + Undo(pcb_false); } if (via->DrillingHole < PCB->minDrill) { AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); @@ -575,11 +575,11 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } IncrementUndoSerialNumber(); - Undo(false); + Undo(pcb_false); } } END_LOOP; @@ -610,7 +610,7 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } } @@ -664,7 +664,7 @@ free(object_id_list); free(object_type_list); if (!throw_drc_dialog()) { - IsBad = true; + IsBad = pcb_true; break; } } @@ -694,7 +694,7 @@ * Check for DRC violations on a single net starting from the pad or pin * sees if the connectivity changes when everything is bloated, or shrunk */ -static bool DRCFind(int What, void *ptr1, void *ptr2, void *ptr3) +static pcb_bool DRCFind(int What, void *ptr1, void *ptr2, void *ptr3) { Coord x, y; int object_count; @@ -706,33 +706,33 @@ Bloat = -PCB->Shrink; TheFlag = PCB_FLAG_DRC | PCB_FLAG_SELECTED; ListStart(What, ptr1, ptr2, ptr3); - DoIt(true, false); + DoIt(pcb_true, pcb_false); /* ok now the shrunk net has the PCB_FLAG_SELECTED set */ DumpList(); TheFlag = PCB_FLAG_FOUND; ListStart(What, ptr1, ptr2, ptr3); Bloat = 0; - drc = true; /* abort the search if we find anything not already found */ - if (DoIt(true, false)) { + drc = pcb_true; /* abort the search if we find anything not already found */ + if (DoIt(pcb_true, pcb_false)) { DumpList(); /* make the flag changes undoable */ TheFlag = PCB_FLAG_FOUND | PCB_FLAG_SELECTED; - ResetConnections(false); - User = true; - drc = false; + ResetConnections(pcb_false); + User = pcb_true; + drc = pcb_false; Bloat = -PCB->Shrink; TheFlag = PCB_FLAG_SELECTED; ListStart(What, ptr1, ptr2, ptr3); - DoIt(true, true); + DoIt(pcb_true, pcb_true); DumpList(); ListStart(What, ptr1, ptr2, ptr3); TheFlag = PCB_FLAG_FOUND; Bloat = 0; - drc = true; - DoIt(true, true); + drc = pcb_true; + DoIt(pcb_true, pcb_true); DumpList(); - User = false; - drc = false; + User = pcb_false; + drc = pcb_false; drcerr_count++; LocateError(&x, &y); BuildObjectList(&object_count, &object_id_list, &object_type_list); @@ -746,36 +746,36 @@ free(object_type_list); if (!throw_drc_dialog()) - return (true); + return (pcb_true); IncrementUndoSerialNumber(); - Undo(true); + Undo(pcb_true); } DumpList(); } /* now check the bloated condition */ - drc = false; - ResetConnections(false); + drc = pcb_false; + ResetConnections(pcb_false); TheFlag = PCB_FLAG_FOUND; ListStart(What, ptr1, ptr2, ptr3); Bloat = PCB->Bloat; - drc = true; - while (DoIt(true, false)) { + drc = pcb_true; + while (DoIt(pcb_true, pcb_false)) { DumpList(); /* make the flag changes undoable */ TheFlag = PCB_FLAG_FOUND | PCB_FLAG_SELECTED; - ResetConnections(false); - User = true; - drc = false; + ResetConnections(pcb_false); + User = pcb_true; + drc = pcb_false; Bloat = 0; TheFlag = PCB_FLAG_SELECTED; ListStart(What, ptr1, ptr2, ptr3); - DoIt(true, true); + DoIt(pcb_true, pcb_true); DumpList(); TheFlag = PCB_FLAG_FOUND; ListStart(What, ptr1, ptr2, ptr3); Bloat = PCB->Bloat; - drc = true; - DoIt(true, true); + drc = pcb_true; + DoIt(pcb_true, pcb_true); DumpList(); drcerr_count++; LocateError(&x, &y); @@ -788,27 +788,27 @@ pcb_drc_violation_free(violation); free(object_id_list); free(object_type_list); - User = false; - drc = false; + User = pcb_false; + drc = pcb_false; if (!throw_drc_dialog()) - return (true); + return (pcb_true); IncrementUndoSerialNumber(); - Undo(true); + Undo(pcb_true); /* highlight the rest of the encroaching net so it's not reported again */ TheFlag |= PCB_FLAG_SELECTED; Bloat = 0; ListStart(thing_type, thing_ptr1, thing_ptr2, thing_ptr3); - DoIt(true, true); + DoIt(pcb_true, pcb_true); DumpList(); - drc = true; + drc = pcb_true; Bloat = PCB->Bloat; ListStart(What, ptr1, ptr2, ptr3); } - drc = false; + drc = pcb_false; DumpList(); TheFlag = PCB_FLAG_FOUND | PCB_FLAG_SELECTED; - ResetConnections(false); - return (false); + ResetConnections(pcb_false); + return (pcb_false); } /*---------------------------------------------------------------------------- @@ -824,7 +824,7 @@ case PCB_TYPE_LINE: case PCB_TYPE_ARC: case PCB_TYPE_POLYGON: - ChangeGroupVisibility(GetLayerNumber(PCB->Data, (LayerTypePtr) thing_ptr1), true, true); + ChangeGroupVisibility(GetLayerNumber(PCB->Data, (LayerTypePtr) thing_ptr1), pcb_true, pcb_true); } CenterDisplay(X, Y); } Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 3382) +++ trunk/src/find_geo.c (revision 3383) @@ -32,7 +32,7 @@ * - calculate the signed distance from the line to the center, * return false if abs(distance) > R * - get the distance from the line <--> distancevector intersection to - * (X1,Y1) in range [0,1], return true if 0 <= distance <= 1 + * (X1,Y1) in range [0,1], return pcb_true if 0 <= distance <= 1 * - depending on (r > 1.0 or r < 0.0) check the distance of X2,Y2 or X1,Y1 * to X,Y * @@ -118,7 +118,7 @@ * * */ -static bool ArcArcIntersect(ArcTypePtr Arc1, ArcTypePtr Arc2) +static pcb_bool ArcArcIntersect(ArcTypePtr Arc1, ArcTypePtr Arc2) { double x, y, dx, dy, r1, r2, a, d, l, t, t1, t2, dl; Coord pdx, pdy; @@ -130,7 +130,7 @@ /* too thin arc */ if (t < 0 || t1 < 0) - return false; + return pcb_false; /* try the end points first */ get_arc_ends(&box[0], Arc1); @@ -139,7 +139,7 @@ || IsPointOnArc(box[2], box[3], t, Arc2) || IsPointOnArc(box[4], box[5], t, Arc1) || IsPointOnArc(box[6], box[7], t, Arc1)) - return true; + return pcb_true; pdx = Arc2->X - Arc1->X; pdy = Arc2->Y - Arc1->Y; @@ -158,12 +158,12 @@ /* sa1 == sa2 was caught when checking endpoints */ if (sa1 > sa2) if (sa1 < sa2 + d2 || sa1 + d1 - 360 > sa2) - return true; + return pcb_true; if (sa2 > sa1) if (sa2 < sa1 + d1 || sa2 + d2 - 360 > sa1) - return true; + return pcb_true; } - return false; + return pcb_false; } r1 = Arc1->Width; r2 = Arc2->Width; @@ -179,7 +179,7 @@ if (radius_crosses_arc(Arc1->X + dx, Arc1->Y + dy, Arc1) && IsPointOnArc(Arc1->X + dx, Arc1->Y + dy, t, Arc2)) - return true; + return pcb_true; dx = -pdx * r2 / dl; dy = -pdy * r2 / dl; @@ -190,8 +190,8 @@ if (radius_crosses_arc(Arc2->X + dx, Arc2->Y + dy, Arc2) && IsPointOnArc(Arc2->X + dx, Arc2->Y + dy, t1, Arc1)) - return true; - return false; + return pcb_true; + return pcb_false; } l = dl * dl; @@ -212,29 +212,29 @@ dy = d * pdy; if (radius_crosses_arc(x + dy, y - dx, Arc1) && IsPointOnArc(x + dy, y - dx, t, Arc2)) - return true; + return pcb_true; if (radius_crosses_arc(x + dy, y - dx, Arc2) && IsPointOnArc(x + dy, y - dx, t1, Arc1)) - return true; + return pcb_true; if (radius_crosses_arc(x - dy, y + dx, Arc1) && IsPointOnArc(x - dy, y + dx, t, Arc2)) - return true; + return pcb_true; if (radius_crosses_arc(x - dy, y + dx, Arc2) && IsPointOnArc(x - dy, y + dx, t1, Arc1)) - return true; - return false; + return pcb_true; + return pcb_false; } /* --------------------------------------------------------------------------- * Tests if point is same as line end point */ -static bool IsRatPointOnLineEnd(PointTypePtr Point, LineTypePtr Line) +static pcb_bool IsRatPointOnLineEnd(PointTypePtr Point, LineTypePtr Line) { if ((Point->X == Line->Point1.X && Point->Y == Line->Point1.Y) || (Point->X == Line->Point2.X && Point->Y == Line->Point2.Y)) - return (true); - return (false); + return (pcb_true); + return (pcb_false); } static void form_slanted_rectangle(PointType p[4], LineTypePtr l) @@ -317,7 +317,7 @@ * Also note that the denominators of eqn 1 & 2 are identical. * */ -bool LineLineIntersect(LineTypePtr Line1, LineTypePtr Line2) +pcb_bool LineLineIntersect(LineTypePtr Line1, LineTypePtr Line2) { double s, r; double line1_dx, line1_dy, line2_dx, line2_dy, point1_dx, point1_dy; @@ -343,7 +343,7 @@ || IsPointInPad(Line2->Point2.X, Line2->Point2.Y, MAX(Line2->Thickness / 2 + Bloat, 0), (PadTypePtr) Line1) || IsPointInPad(Line1->Point1.X, Line1->Point1.Y, MAX(Line1->Thickness / 2 + Bloat, 0), (PadTypePtr) Line2) || IsPointInPad(Line1->Point2.X, Line1->Point2.Y, MAX(Line1->Thickness / 2 + Bloat, 0), (PadTypePtr) Line2)) - return true; + return pcb_true; /* setup some constants */ line1_dx = Line1->Point2.X - Line1->Point1.X; @@ -357,7 +357,7 @@ * endpoint check above will have caught an "intersection". */ if ((line1_dx == 0 && line1_dy == 0) || (line2_dx == 0 && line2_dy == 0)) - return false; + return pcb_false; /* set s to cross product of Line1 and the line * Line1.Point1--Line2.Point1 (as vectors) */ @@ -371,7 +371,7 @@ * check before getting here, the above IsPointInPad() checks * will have caught any intersections. */ if (r == 0.0) - return false; + return pcb_false; s /= r; r = (point1_dy * line2_dx - point1_dx * line2_dy) / r; @@ -381,8 +381,8 @@ return (s >= 0.0 && s <= 1.0); /* intersection is at least on CD */ - /* [removed this case since it always returns false --asp] */ - return false; + /* [removed this case since it always returns pcb_false --asp] */ + return pcb_false; } /*--------------------------------------------------- @@ -414,7 +414,7 @@ * * The end points are hell so they are checked individually */ -bool LineArcIntersect(LineTypePtr Line, ArcTypePtr Arc) +pcb_bool LineArcIntersect(LineTypePtr Line, ArcTypePtr Arc) { double dx, dy, dx1, dy1, l, d, r, r2, Radius; BoxTypePtr box; @@ -433,32 +433,32 @@ r2 = Radius * l - d; /* projection doesn't even intersect circle when r2 < 0 */ if (r2 < 0) - return (false); + return (pcb_false); /* check the ends of the line in case the projected point */ /* of intersection is beyond the line end */ if (IsPointOnArc(Line->Point1.X, Line->Point1.Y, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc)) - return (true); + return (pcb_true); if (IsPointOnArc(Line->Point2.X, Line->Point2.Y, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc)) - return (true); + return (pcb_true); if (l == 0.0) - return (false); + return (pcb_false); r2 = sqrt(r2); Radius = -(dx * dx1 + dy * dy1); r = (Radius + r2) / l; if (r >= 0 && r <= 1 && IsPointOnArc(Line->Point1.X + r * dx, Line->Point1.Y + r * dy, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc)) - return (true); + return (pcb_true); r = (Radius - r2) / l; if (r >= 0 && r <= 1 && IsPointOnArc(Line->Point1.X + r * dx, Line->Point1.Y + r * dy, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc)) - return (true); + return (pcb_true); /* check arc end points */ box = GetArcEnds(Arc); if (IsPointInPad(box->X1, box->Y1, Arc->Thickness * 0.5 + Bloat, (PadTypePtr) Line)) - return true; + return pcb_true; if (IsPointInPad(box->X2, box->Y2, Arc->Thickness * 0.5 + Bloat, (PadTypePtr) Line)) - return true; - return false; + return pcb_true; + return pcb_false; } /* --------------------------------------------------------------------------- @@ -469,15 +469,15 @@ * - check the two end points of the arc. If none of them matches * - check all segments of the polygon against the arc. */ -bool IsArcInPolygon(ArcTypePtr Arc, PolygonTypePtr Polygon) +pcb_bool IsArcInPolygon(ArcTypePtr Arc, PolygonTypePtr Polygon) { BoxTypePtr Box = (BoxType *) Arc; /* arcs with clearance never touch polys */ if (TEST_FLAG(PCB_FLAG_CLEARPOLY, Polygon) && TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) - return false; + return pcb_false; if (!Polygon->Clipped) - return false; + return pcb_false; if (Box->X1 <= Polygon->Clipped->contours->xmax + Bloat && Box->X2 >= Polygon->Clipped->contours->xmin - Bloat && Box->Y1 <= Polygon->Clipped->contours->ymax + Bloat && Box->Y2 >= Polygon->Clipped->contours->ymin - Bloat) { @@ -484,10 +484,10 @@ POLYAREA *ap; if (!(ap = ArcPoly(Arc, Arc->Thickness + Bloat))) - return false; /* error */ - return isects(ap, Polygon, true); + return pcb_false; /* error */ + return isects(ap, Polygon, pcb_true); } - return false; + return pcb_false; } /* --------------------------------------------------------------------------- @@ -498,7 +498,7 @@ * - check the two end points of the line. If none of them matches * - check all segments of the polygon against the line. */ -bool IsLineInPolygon(LineTypePtr Line, PolygonTypePtr Polygon) +pcb_bool IsLineInPolygon(LineTypePtr Line, PolygonTypePtr Polygon) { BoxTypePtr Box = (BoxType *) Line; POLYAREA *lp; @@ -505,9 +505,9 @@ /* lines with clearance never touch polygons */ if (TEST_FLAG(PCB_FLAG_CLEARPOLY, Polygon) && TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) - return false; + return pcb_false; if (!Polygon->Clipped) - return false; + return pcb_false; if (TEST_FLAG(PCB_FLAG_SQUARE, Line) && (Line->Point1.X == Line->Point2.X || Line->Point1.Y == Line->Point2.Y)) { Coord wid = (Line->Thickness + Bloat + 1) / 2; Coord x1, x2, y1, y2; @@ -523,9 +523,9 @@ && Box->Y1 <= Polygon->Clipped->contours->ymax + Bloat && Box->Y2 >= Polygon->Clipped->contours->ymin - Bloat) { if (!(lp = LinePoly(Line, Line->Thickness + Bloat))) return FALSE; /* error */ - return isects(lp, Polygon, true); + return isects(lp, Polygon, pcb_true); } - return false; + return pcb_false; } /* --------------------------------------------------------------------------- @@ -533,7 +533,7 @@ * * The polygon is assumed to already have been proven non-clearing */ -bool IsPadInPolygon(PadTypePtr pad, PolygonTypePtr polygon) +pcb_bool IsPadInPolygon(PadTypePtr pad, PolygonTypePtr polygon) { return IsLineInPolygon((LineTypePtr) pad, polygon); } @@ -544,10 +544,10 @@ * First check all points out of P1 against P2 and vice versa. * If both fail check all lines of P1 against the ones of P2 */ -bool IsPolygonInPolygon(PolygonTypePtr P1, PolygonTypePtr P2) +pcb_bool IsPolygonInPolygon(PolygonTypePtr P1, PolygonTypePtr P2) { if (!P1->Clipped || !P2->Clipped) - return false; + return pcb_false; assert(P1->Clipped->contours); assert(P2->Clipped->contours); @@ -556,10 +556,10 @@ P1->Clipped->contours->xmax + Bloat < P2->Clipped->contours->xmin || P1->Clipped->contours->ymin - Bloat > P2->Clipped->contours->ymax || P1->Clipped->contours->ymax + Bloat < P2->Clipped->contours->ymin) - return false; + return pcb_false; /* first check un-bloated case */ - if (isects(P1->Clipped, P2, false)) + if (isects(P1->Clipped, P2, pcb_false)) return TRUE; /* now the difficult case of bloated */ @@ -582,7 +582,7 @@ line.Point2.Y = v->point[1]; SetLineBoundingBox(&line); if (IsLineInPolygon(&line, P2)) - return (true); + return (pcb_true); line.Point1.X = line.Point2.X; line.Point1.Y = line.Point2.Y; } @@ -590,7 +590,7 @@ } } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- @@ -597,31 +597,31 @@ * some of the 'pad' routines are the same as for lines because the 'pad' * struct starts with a line struct. See global.h for details */ -bool LinePadIntersect(LineTypePtr Line, PadTypePtr Pad) +pcb_bool LinePadIntersect(LineTypePtr Line, PadTypePtr Pad) { return LineLineIntersect((Line), (LineTypePtr) Pad); } -bool ArcPadIntersect(ArcTypePtr Arc, PadTypePtr Pad) +pcb_bool ArcPadIntersect(ArcTypePtr Arc, PadTypePtr Pad) { return LineArcIntersect((LineTypePtr) (Pad), (Arc)); } -bool BoxBoxIntersection(BoxTypePtr b1, BoxTypePtr b2) +pcb_bool BoxBoxIntersection(BoxTypePtr b1, BoxTypePtr b2) { if (b2->X2 < b1->X1 || b2->X1 > b1->X2) - return false; + return pcb_false; if (b2->Y2 < b1->Y1 || b2->Y1 > b1->Y2) - return false; - return true; + return pcb_false; + return pcb_true; } -static bool PadPadIntersect(PadTypePtr p1, PadTypePtr p2) +static pcb_bool PadPadIntersect(PadTypePtr p1, PadTypePtr p2) { return LinePadIntersect((LineTypePtr) p1, p2); } -static inline bool PV_TOUCH_PV(PinTypePtr PV1, PinTypePtr PV2) +static inline pcb_bool PV_TOUCH_PV(PinTypePtr PV1, PinTypePtr PV2) { double t1, t2; BoxType b1, b2; @@ -647,9 +647,9 @@ t2 = MAX(PV2->Thickness / 2.0 + Bloat, 0); if (IsPointOnPin(PV1->X, PV1->Y, t1, PV2) || IsPointOnPin(PV2->X, PV2->Y, t2, PV1)) - return true; + return pcb_true; if (!TEST_FLAG(PCB_FLAG_SQUARE, PV1) || !TEST_FLAG(PCB_FLAG_SQUARE, PV2)) - return false; + return pcb_false; /* check for square/square overlap */ b1.X1 = PV1->X - t1; b1.X2 = PV1->X + t1; @@ -663,7 +663,7 @@ return BoxBoxIntersection(&b1, &b2); } -bool PinLineIntersect(PinTypePtr PV, LineTypePtr Line) +pcb_bool PinLineIntersect(PinTypePtr PV, LineTypePtr Line) { if (TEST_FLAG(PCB_FLAG_SQUARE, PV)) { int shape = GET_SQUARE(PV); Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 3382) +++ trunk/src/find_lookup.c (revision 3383) @@ -44,7 +44,7 @@ /* Connection lookup functions */ -static bool ADD_PV_TO_LIST(PinTypePtr Pin, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_PV_TO_LIST(PinTypePtr Pin, int from_type, void *from_ptr, found_conn_type_t type) { if (User) AddObjectToFlagUndoList(Pin->Element ? PCB_TYPE_PIN : PCB_TYPE_VIA, Pin->Element ? Pin->Element : Pin, Pin, Pin); @@ -58,10 +58,10 @@ #endif if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, Pin)) return (SetThing(PCB_TYPE_PIN, Pin->Element, Pin, Pin)); - return false; + return pcb_false; } -static bool ADD_PAD_TO_LIST(Cardinal L, PadTypePtr Pad, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_PAD_TO_LIST(Cardinal L, PadTypePtr Pad, int from_type, void *from_ptr, found_conn_type_t type) { /*fprintf(stderr, "ADD_PAD_TO_LIST cardinal %d %p %d\n", L, Pad, from_type);*/ if (User) @@ -76,10 +76,10 @@ #endif if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, Pad)) return (SetThing(PCB_TYPE_PAD, Pad->Element, Pad, Pad)); - return false; + return pcb_false; } -static bool ADD_LINE_TO_LIST(Cardinal L, LineTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_LINE_TO_LIST(Cardinal L, LineTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_LINE, LAYER_PTR(L), (Ptr), (Ptr)); @@ -93,10 +93,10 @@ #endif if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, (Ptr))) return (SetThing(PCB_TYPE_LINE, LAYER_PTR(L), (Ptr), (Ptr))); - return false; + return pcb_false; } -static bool ADD_ARC_TO_LIST(Cardinal L, ArcTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_ARC_TO_LIST(Cardinal L, ArcTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_ARC, LAYER_PTR(L), (Ptr), (Ptr)); @@ -110,10 +110,10 @@ #endif if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, (Ptr))) return (SetThing(PCB_TYPE_ARC, LAYER_PTR(L), (Ptr), (Ptr))); - return false; + return pcb_false; } -static bool ADD_RAT_TO_LIST(RatTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_RAT_TO_LIST(RatTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_RATLINE, (Ptr), (Ptr), (Ptr)); @@ -127,10 +127,10 @@ #endif if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, (Ptr))) return (SetThing(PCB_TYPE_RATLINE, (Ptr), (Ptr), (Ptr))); - return false; + return pcb_false; } -static bool ADD_POLYGON_TO_LIST(Cardinal L, PolygonTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_POLYGON_TO_LIST(Cardinal L, PolygonTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_POLYGON, LAYER_PTR(L), (Ptr), (Ptr)); @@ -144,10 +144,10 @@ #endif if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, (Ptr))) return (SetThing(PCB_TYPE_POLYGON, LAYER_PTR(L), (Ptr), (Ptr))); - return false; + return pcb_false; } -bool SetThing(int type, void *ptr1, void *ptr2, void *ptr3) +pcb_bool SetThing(int type, void *ptr1, void *ptr2, void *ptr3) { thing_ptr1 = ptr1; thing_ptr2 = ptr2; @@ -157,7 +157,7 @@ thing_ptr1 = ptr3; thing_type = PCB_TYPE_VIA; } - return true; + return pcb_true; } /* --------------------------------------------------------------------------- @@ -361,7 +361,7 @@ } else if (TEST_FLAG(PCB_FLAG_OCTAGON, &i->pv)) { POLYAREA *oct = OctagonPoly(i->pv.X, i->pv.Y, i->pv.Thickness / 2, GET_SQUARE(&i->pv)); - if (isects(oct, polygon, true) + if (isects(oct, polygon, pcb_true) && ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PIN, &i->pv, FCT_COPPER)) longjmp(i->env, 1); } @@ -376,7 +376,7 @@ * checks if a PV is connected to LOs, if it is, the LO is added to * the appropriate list and the 'used' flag is set */ -static bool LookupLOConnectionsToPVList(bool AndRats) +static pcb_bool LookupLOConnectionsToPVList(pcb_bool AndRats) { Cardinal layer; struct pv_info info; @@ -391,7 +391,7 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->pad_tree, (BoxType *) & info.pv, NULL, LOCtoPVpad_callback, &info, NULL); else - return true; + return pcb_true; /* now all lines, arcs and polygons of the several layers */ for (layer = 0; layer < max_copper_layer; layer++) { @@ -402,17 +402,17 @@ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->line_tree, (BoxType *) & info.pv, NULL, LOCtoPVline_callback, &info, NULL); else - return true; + return pcb_true; /* add touching arcs */ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->arc_tree, (BoxType *) & info.pv, NULL, LOCtoPVarc_callback, &info, NULL); else - return true; + return pcb_true; /* check all polygons */ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->polygon_tree, (BoxType *) & info.pv, NULL, LOCtoPVpoly_callback, &info, NULL); else - return true; + return pcb_true; } /* Check for rat-lines that may intersect the PV */ if (AndRats) { @@ -419,19 +419,19 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->rat_tree, (BoxType *) & info.pv, NULL, LOCtoPVrat_callback, &info, NULL); else - return true; + return pcb_true; } PVList.Location++; } - return false; + return pcb_false; } /* --------------------------------------------------------------------------- * find all connections between LO at the current list position and new LOs */ -static bool LookupLOConnectionsToLOList(bool AndRats) +static pcb_bool LookupLOConnectionsToLOList(pcb_bool AndRats) { - bool done; + pcb_bool done; Cardinal i, group, layer, ratposition, lineposition[MAX_LAYER], polyposition[MAX_LAYER], arcposition[MAX_LAYER], padposition[2]; @@ -459,10 +459,10 @@ for (; *position < RatList.Number; (*position)++) { group = RATLIST_ENTRY(*position)->group1; if (LookupLOConnectionsToRatEnd(&(RATLIST_ENTRY(*position)->Point1), group)) - return (true); + return (pcb_true); group = RATLIST_ENTRY(*position)->group2; if (LookupLOConnectionsToRatEnd(&(RATLIST_ENTRY(*position)->Point2), group)) - return (true); + return (pcb_true); } } /* loop over all layergroups */ @@ -479,20 +479,20 @@ /* try all new lines */ position = &lineposition[layer]; for (; *position < LineList[layer].Number; (*position)++) - if (LookupLOConnectionsToLine(LINELIST_ENTRY(layer, *position), group, true)) - return (true); + if (LookupLOConnectionsToLine(LINELIST_ENTRY(layer, *position), group, pcb_true)) + return (pcb_true); /* try all new arcs */ position = &arcposition[layer]; for (; *position < ArcList[layer].Number; (*position)++) if (LookupLOConnectionsToArc(ARCLIST_ENTRY(layer, *position), group)) - return (true); + return (pcb_true); /* try all new polygons */ position = &polyposition[layer]; for (; *position < PolygonList[layer].Number; (*position)++) if (LookupLOConnectionsToPolygon(POLYGONLIST_ENTRY(layer, *position), group)) - return (true); + return (pcb_true); } else { /* try all new pads */ @@ -499,12 +499,12 @@ layer -= max_copper_layer; if (layer > 1) { Message(PCB_MSG_DEFAULT, _("bad layer number %d max_copper_layer=%d in find.c\n"), layer, max_copper_layer); - return false; + return pcb_false; } position = &padposition[layer]; for (; *position < PadList[layer].Number; (*position)++) if (LookupLOConnectionsToPad(PADLIST_ENTRY(layer, *position), group)) - return (true); + return (pcb_true); } } } @@ -523,7 +523,7 @@ } } while (!done); - return (false); + return (pcb_false); } static r_dir_t pv_pv_callback(const BoxType * b, void *cl) @@ -534,7 +534,7 @@ if (!TEST_FLAG(TheFlag, pin) && PV_TOUCH_PV(&i->pv, pin)) { if (TEST_FLAG(PCB_FLAG_HOLE, pin) || TEST_FLAG(PCB_FLAG_HOLE, &i->pv)) { SET_FLAG(PCB_FLAG_WARN, pin); - conf_core.temp.rat_warn = true; + conf_core.temp.rat_warn = pcb_true; if (pin->Element) Message(PCB_MSG_DEFAULT, _("WARNING: Hole too close to pin.\n")); else @@ -549,7 +549,7 @@ /* --------------------------------------------------------------------------- * searches for new PVs that are connected to PVs on the list */ -static bool LookupPVConnectionsToPVList(void) +static pcb_bool LookupPVConnectionsToPVList(void) { Cardinal save_place; struct pv_info info; @@ -584,15 +584,15 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->via_tree, (BoxType *) & info.pv, NULL, pv_pv_callback, &info, NULL); else - return true; + return pcb_true; if (setjmp(info.env) == 0) r_search(PCB->Data->pin_tree, (BoxType *) & info.pv, NULL, pv_pv_callback, &info, NULL); else - return true; + return pcb_true; PVList.Location++; } PVList.Location = save_place; - return (false); + return (pcb_false); } struct lo_info { @@ -613,7 +613,7 @@ if (!TEST_FLAG(TheFlag, pv) && PinLineIntersect(pv, &i->line)) { if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { SET_FLAG(PCB_FLAG_WARN, pv); - conf_core.temp.rat_warn = true; + conf_core.temp.rat_warn = pcb_true; Message(PCB_MSG_DEFAULT, _("WARNING: Hole too close to line.\n")); } else if (ADD_PV_TO_LIST(pv, PCB_TYPE_LINE, &i->line, FCT_COPPER)) @@ -630,7 +630,7 @@ if (!TEST_FLAG(TheFlag, pv) && IS_PV_ON_PAD(pv, &i->pad)) { if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { SET_FLAG(PCB_FLAG_WARN, pv); - conf_core.temp.rat_warn = true; + conf_core.temp.rat_warn = pcb_true; Message(PCB_MSG_DEFAULT, _("WARNING: Hole too close to pad.\n")); } else if (ADD_PV_TO_LIST(pv, PCB_TYPE_PAD, &i->pad, FCT_COPPER)) @@ -647,7 +647,7 @@ if (!TEST_FLAG(TheFlag, pv) && IS_PV_ON_ARC(pv, &i->arc)) { if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { SET_FLAG(PCB_FLAG_WARN, pv); - conf_core.temp.rat_warn = true; + conf_core.temp.rat_warn = pcb_true; Message(PCB_MSG_DEFAULT, _("WARNING: Hole touches arc.\n")); } else if (ADD_PV_TO_LIST(pv, PCB_TYPE_ARC, &i->arc, FCT_COPPER)) @@ -676,7 +676,7 @@ } else if (TEST_FLAG(PCB_FLAG_OCTAGON, pv)) { POLYAREA *oct = OctagonPoly(pv->X, pv->Y, PIN_SIZE(pv) / 2, GET_SQUARE(pv)); - if (isects(oct, &i->polygon, true) && ADD_PV_TO_LIST(pv, PCB_TYPE_POLYGON, &i->polygon, FCT_COPPER)) + if (isects(oct, &i->polygon, pcb_true) && ADD_PV_TO_LIST(pv, PCB_TYPE_POLYGON, &i->polygon, FCT_COPPER)) longjmp(i->env, 1); } else { @@ -703,7 +703,7 @@ * searches for new PVs that are connected to NEW LOs on the list * This routine updates the position counter of the lists too. */ -static bool LookupPVConnectionsToLOList(bool AndRats) +static pcb_bool LookupPVConnectionsToLOList(pcb_bool AndRats) { Cardinal layer; struct lo_info info; @@ -727,11 +727,11 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->via_tree, (BoxType *) & info.line, NULL, pv_line_callback, &info, NULL); else - return true; + return pcb_true; if (setjmp(info.env) == 0) r_search(PCB->Data->pin_tree, (BoxType *) & info.line, NULL, pv_line_callback, &info, NULL); else - return true; + return pcb_true; LineList[layer].Location++; } @@ -742,11 +742,11 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->via_tree, (BoxType *) & info.arc, NULL, pv_arc_callback, &info, NULL); else - return true; + return pcb_true; if (setjmp(info.env) == 0) r_search(PCB->Data->pin_tree, (BoxType *) & info.arc, NULL, pv_arc_callback, &info, NULL); else - return true; + return pcb_true; ArcList[layer].Location++; } @@ -758,11 +758,11 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->via_tree, (BoxType *) & info.polygon, NULL, pv_poly_callback, &info, NULL); else - return true; + return pcb_true; if (setjmp(info.env) == 0) r_search(PCB->Data->pin_tree, (BoxType *) & info.polygon, NULL, pv_poly_callback, &info, NULL); else - return true; + return pcb_true; PolygonList[layer].Location++; } } @@ -784,11 +784,11 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->via_tree, (BoxType *) & info.pad, NULL, pv_pad_callback, &info, NULL); else - return true; + return pcb_true; if (setjmp(info.env) == 0) r_search(PCB->Data->pin_tree, (BoxType *) & info.pad, NULL, pv_pad_callback, &info, NULL); else - return true; + return pcb_true; PadList[layer].Location++; } } @@ -809,7 +809,7 @@ RatList.Location++; } } - return (false); + return (pcb_false); } r_dir_t pv_touch_callback(const BoxType * b, void *cl) @@ -866,7 +866,7 @@ * the notation that is used is: * Xij means Xj at arc i */ -static bool LookupLOConnectionsToArc(ArcTypePtr Arc, Cardinal LayerGroup) +static pcb_bool LookupLOConnectionsToArc(ArcTypePtr Arc, Cardinal LayerGroup) { Cardinal entry; struct lo_info info; @@ -889,18 +889,18 @@ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->line_tree, &info.arc.BoundingBox, NULL, LOCtoArcLine_callback, &info, NULL); else - return true; + return pcb_true; if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->arc_tree, &info.arc.BoundingBox, NULL, LOCtoArcArc_callback, &info, NULL); else - return true; + return pcb_true; /* now check all polygons */ polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) { if (!TEST_FLAG(TheFlag, polygon) && IsArcInPolygon(Arc, polygon) && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_ARC, Arc, FCT_COPPER)) - return true; + return pcb_true; } } else { @@ -908,10 +908,10 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->pad_tree, &info.arc.BoundingBox, NULL, LOCtoArcPad_callback, &info, NULL); else - return true; + return pcb_true; } } - return (false); + return (pcb_false); } static r_dir_t LOCtoLineLine_callback(const BoxType * b, void *cl) @@ -978,7 +978,7 @@ * the notation that is used is: * Xij means Xj at line i */ -static bool LookupLOConnectionsToLine(LineTypePtr Line, Cardinal LayerGroup, bool PolysTo) +static pcb_bool LookupLOConnectionsToLine(LineTypePtr Line, Cardinal LayerGroup, pcb_bool PolysTo) { Cardinal entry; struct lo_info info; @@ -990,7 +990,7 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->rat_tree, &info.line.BoundingBox, NULL, LOCtoLineRat_callback, &info, NULL); else - return true; + return pcb_true; /* loop over all layers of the group */ for (entry = 0; entry < PCB->LayerGroups.Number[LayerGroup]; entry++) { @@ -1005,12 +1005,12 @@ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->line_tree, (BoxType *) & info.line, NULL, LOCtoLineLine_callback, &info, NULL); else - return true; + return pcb_true; /* add arcs */ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->arc_tree, (BoxType *) & info.line, NULL, LOCtoLineArc_callback, &info, NULL); else - return true; + return pcb_true; /* now check all polygons */ if (PolysTo) { gdl_iterator_t it; @@ -1019,7 +1019,7 @@ polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) { if (!TEST_FLAG(TheFlag, polygon) && IsLineInPolygon(Line, polygon) && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_LINE, Line, FCT_COPPER)) - return true; + return pcb_true; } } } @@ -1029,10 +1029,10 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->pad_tree, &info.line.BoundingBox, NULL, LOCtoLinePad_callback, &info, NULL); else - return true; + return pcb_true; } } - return (false); + return (pcb_false); } @@ -1093,7 +1093,7 @@ * the notation that is used is: * Xij means Xj at line i */ -static bool LookupLOConnectionsToRatEnd(PointTypePtr Point, Cardinal LayerGroup) +static pcb_bool LookupLOConnectionsToRatEnd(PointTypePtr Point, Cardinal LayerGroup) { Cardinal entry; struct rat_info info; @@ -1114,7 +1114,7 @@ if (setjmp(info.env) == 0) r_search_pt(LAYER_PTR(layer)->line_tree, Point, 1, NULL, LOCtoRat_callback, &info, NULL); else - return true; + return pcb_true; if (setjmp(info.env) == 0) r_search_pt(LAYER_PTR(layer)->polygon_tree, Point, 1, NULL, PolygonToRat_callback, &info, NULL); } @@ -1124,10 +1124,10 @@ if (setjmp(info.env) == 0) r_search_pt(PCB->Data->pad_tree, Point, 1, NULL, LOCtoPad_callback, &info, NULL); else - return true; + return pcb_true; } } - return (false); + return (pcb_false); } static r_dir_t LOCtoPadLine_callback(const BoxType * b, void *cl) @@ -1210,12 +1210,12 @@ * searches all LOs that are connected to the given pad on the given * layergroup. All found connections are added to the list */ -static bool LookupLOConnectionsToPad(PadTypePtr Pad, Cardinal LayerGroup) +static pcb_bool LookupLOConnectionsToPad(PadTypePtr Pad, Cardinal LayerGroup) { Cardinal entry; struct lo_info info; int ic; - bool retv = false; + pcb_bool retv = pcb_false; /* Internal connection: if pads in the same element have the same internal connection group number, they are connected */ @@ -1248,7 +1248,7 @@ /*fprintf(stderr, "layergroup2\n");*/ ADD_PAD_TO_LIST(padlayer, pad, PCB_TYPE_PAD, orig_pad, FCT_INTERNAL); if (LookupLOConnectionsToPad(pad, LayerGroup)) - retv = true; + retv = pcb_true; } } } @@ -1258,7 +1258,7 @@ if (!TEST_FLAG(PCB_FLAG_SQUARE, Pad)) - return (LookupLOConnectionsToLine((LineTypePtr) Pad, LayerGroup, false)); + return (LookupLOConnectionsToLine((LineTypePtr) Pad, LayerGroup, pcb_false)); info.pad = *Pad; EXPAND_BOUNDS(&info.pad); @@ -1267,7 +1267,7 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->rat_tree, &info.pad.BoundingBox, NULL, LOCtoPadRat_callback, &info, NULL); else - return true; + return pcb_true; /* loop over all layers of the group */ for (entry = 0; entry < PCB->LayerGroups.Number[LayerGroup]; entry++) { @@ -1281,17 +1281,17 @@ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->line_tree, &info.pad.BoundingBox, NULL, LOCtoPadLine_callback, &info, NULL); else - return true; + return pcb_true; /* add arcs */ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->arc_tree, &info.pad.BoundingBox, NULL, LOCtoPadArc_callback, &info, NULL); else - return true; + return pcb_true; /* add polygons */ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->polygon_tree, &info.pad.BoundingBox, NULL, LOCtoPadPoly_callback, &info, NULL); else - return true; + return pcb_true; } else { /* handle special 'pad' layers */ @@ -1299,7 +1299,7 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->pad_tree, (BoxType *) & info.pad, NULL, LOCtoPadPad_callback, &info, NULL); else - return true; + return pcb_true; } } @@ -1367,13 +1367,13 @@ * looks up LOs that are connected to the given polygon * on the given layergroup. All found connections are added to the list */ -static bool LookupLOConnectionsToPolygon(PolygonTypePtr Polygon, Cardinal LayerGroup) +static pcb_bool LookupLOConnectionsToPolygon(PolygonTypePtr Polygon, Cardinal LayerGroup) { Cardinal entry; struct lo_info info; if (!Polygon->Clipped) - return false; + return pcb_false; info.polygon = *Polygon; EXPAND_BOUNDS(&info.polygon); info.layer = LayerGroup; @@ -1381,7 +1381,7 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->rat_tree, (BoxType *) & info.polygon, NULL, LOCtoPolyRat_callback, &info, NULL); else - return true; + return pcb_true; /* loop over all layers of the group */ for (entry = 0; entry < PCB->LayerGroups.Number[LayerGroup]; entry++) { Cardinal layer; @@ -1398,7 +1398,7 @@ if (!TEST_FLAG(TheFlag, polygon) && IsPolygonInPolygon(polygon, Polygon) && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_POLYGON, Polygon, FCT_COPPER)) - return true; + return pcb_true; } info.layer = layer; @@ -1406,12 +1406,12 @@ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->line_tree, (BoxType *) & info.polygon, NULL, LOCtoPolyLine_callback, &info, NULL); else - return true; + return pcb_true; /* check all arcs */ if (setjmp(info.env) == 0) r_search(LAYER_PTR(layer)->arc_tree, (BoxType *) & info.polygon, NULL, LOCtoPolyArc_callback, &info, NULL); else - return true; + return pcb_true; } else { info.layer = layer - max_copper_layer; @@ -1418,8 +1418,8 @@ if (setjmp(info.env) == 0) r_search(PCB->Data->pad_tree, (BoxType *) & info.polygon, NULL, LOCtoPolyPad_callback, &info, NULL); else - return true; + return pcb_true; } } - return (false); + return (pcb_false); } Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 3382) +++ trunk/src/find_misc.c (revision 3383) @@ -30,9 +30,9 @@ /* --------------------------------------------------------------------------- * checks if all lists of new objects are handled */ -static bool ListsEmpty(bool AndRats) +static pcb_bool ListsEmpty(pcb_bool AndRats) { - bool empty; + pcb_bool empty; int i; empty = (PVList.Location >= PVList.Number); @@ -58,9 +58,9 @@ /* --------------------------------------------------------------------------- * loops till no more connections are found */ -static bool DoIt(bool AndRats, bool AndDraw) +static pcb_bool DoIt(pcb_bool AndRats, pcb_bool AndDraw) { - bool newone = false; + pcb_bool newone = pcb_false; reassign_no_drc_flags(); do { /* lookup connections; these are the steps (2) to (4) @@ -147,7 +147,7 @@ /*--------------------------------------------------------------------------- * add the starting object to the list of found objects */ -static bool ListStart(int type, void *ptr1, void *ptr2, void *ptr3) +static pcb_bool ListStart(int type, void *ptr1, void *ptr2, void *ptr3) { DumpList(); switch (type) { @@ -155,7 +155,7 @@ case PCB_TYPE_VIA: { if (ADD_PV_TO_LIST((PinTypePtr) ptr2, 0, NULL, FCT_START)) - return true; + return pcb_true; break; } @@ -162,7 +162,7 @@ case PCB_TYPE_RATLINE: { if (ADD_RAT_TO_LIST((RatTypePtr) ptr1, 0, NULL, FCT_START)) - return true; + return pcb_true; break; } @@ -172,7 +172,7 @@ (LayerTypePtr) ptr1); if (ADD_LINE_TO_LIST(layer, (LineTypePtr) ptr2, 0, NULL, FCT_START)) - return true; + return pcb_true; break; } @@ -182,7 +182,7 @@ (LayerTypePtr) ptr1); if (ADD_ARC_TO_LIST(layer, (ArcTypePtr) ptr2, 0, NULL, FCT_START)) - return true; + return pcb_true; break; } @@ -192,7 +192,7 @@ (LayerTypePtr) ptr1); if (ADD_POLYGON_TO_LIST(layer, (PolygonTypePtr) ptr2, 0, NULL, FCT_START)) - return true; + return pcb_true; break; } @@ -200,11 +200,11 @@ { PadTypePtr pad = (PadTypePtr) ptr2; if (ADD_PAD_TO_LIST(TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, 0, NULL, FCT_START)) - return true; + return pcb_true; break; } } - return (false); + return (pcb_false); } @@ -211,10 +211,10 @@ /* --------------------------------------------------------------------------- * looks up all connections from the object at the given coordinates * the TheFlag (normally 'PCB_FLAG_FOUND') is set for all objects found - * the objects are re-drawn if AndDraw is true - * also the action is marked as undoable if AndDraw is true + * the objects are re-drawn if AndDraw is pcb_true + * also the action is marked as undoable if AndDraw is pcb_true */ -void LookupConnection(Coord X, Coord Y, bool AndDraw, Coord Range, int which_flag) +void LookupConnection(Coord X, Coord Y, pcb_bool AndDraw, Coord Range, int which_flag) { void *ptr1, *ptr2, *ptr3; char *name; @@ -251,10 +251,10 @@ * This is step (1) from the description */ ListStart(type, ptr1, ptr2, ptr3); - DoIt(true, AndDraw); + DoIt(pcb_true, AndDraw); if (User) IncrementUndoSerialNumber(); - User = false; + User = pcb_false; /* we are done */ if (AndDraw) @@ -268,21 +268,21 @@ * find connections for rats nesting * assumes InitConnectionLookup() has already been done */ -void RatFindHook(int type, void *ptr1, void *ptr2, void *ptr3, bool undo, bool AndRats) +void RatFindHook(int type, void *ptr1, void *ptr2, void *ptr3, pcb_bool undo, pcb_bool AndRats) { User = undo; DumpList(); ListStart(type, ptr1, ptr2, ptr3); - DoIt(AndRats, false); - User = false; + DoIt(AndRats, pcb_false); + User = pcb_false; } /* --------------------------------------------------------------------------- * resets all used flags of pins and vias */ -bool ResetFoundPinsViasAndPads(bool AndDraw) +pcb_bool ResetFoundPinsViasAndPads(pcb_bool AndDraw) { - bool change = false; + pcb_bool change = pcb_false; VIA_LOOP(PCB->Data); { @@ -292,7 +292,7 @@ CLEAR_FLAG(TheFlag, via); if (AndDraw) DrawVia(via); - change = true; + change = pcb_true; } } END_LOOP; @@ -306,7 +306,7 @@ CLEAR_FLAG(TheFlag, pin); if (AndDraw) DrawPin(pin); - change = true; + change = pcb_true; } } END_LOOP; @@ -318,7 +318,7 @@ CLEAR_FLAG(TheFlag, pad); if (AndDraw) DrawPad(pad); - change = true; + change = pcb_true; } } END_LOOP; @@ -325,7 +325,7 @@ } END_LOOP; if (change) - SetChangedFlag(true); + SetChangedFlag(pcb_true); return change; } @@ -332,9 +332,9 @@ /* --------------------------------------------------------------------------- * resets all used flags of LOs */ -bool ResetFoundLinesAndPolygons(bool AndDraw) +pcb_bool ResetFoundLinesAndPolygons(pcb_bool AndDraw) { - bool change = false; + pcb_bool change = pcb_false; RAT_LOOP(PCB->Data); { @@ -344,7 +344,7 @@ CLEAR_FLAG(TheFlag, line); if (AndDraw) DrawRat(line); - change = true; + change = pcb_true; } } END_LOOP; @@ -356,7 +356,7 @@ CLEAR_FLAG(TheFlag, line); if (AndDraw) DrawLine(layer, line); - change = true; + change = pcb_true; } } ENDALL_LOOP; @@ -368,7 +368,7 @@ CLEAR_FLAG(TheFlag, arc); if (AndDraw) DrawArc(layer, arc); - change = true; + change = pcb_true; } } ENDALL_LOOP; @@ -380,12 +380,12 @@ CLEAR_FLAG(TheFlag, polygon); if (AndDraw) DrawPolygon(layer, polygon); - change = true; + change = pcb_true; } } ENDALL_LOOP; if (change) - SetChangedFlag(true); + SetChangedFlag(pcb_true); return change; } @@ -392,9 +392,9 @@ /* --------------------------------------------------------------------------- * resets all found connections */ -bool ResetConnections(bool AndDraw) +pcb_bool ResetConnections(pcb_bool AndDraw) { - bool change = false; + pcb_bool change = pcb_false; change = ResetFoundPinsViasAndPads(AndDraw) || change; change = ResetFoundLinesAndPolygons(AndDraw) || change; Index: trunk/src/find_print.c =================================================================== --- trunk/src/find_print.c (revision 3382) +++ trunk/src/find_print.c (revision 3383) @@ -27,14 +27,14 @@ /* Connection export/output functions */ -static bool PrepareNextLoop(FILE * FP); +static pcb_bool PrepareNextLoop(FILE * FP); /* --------------------------------------------------------------------------- * prints all unused pins of an element to file FP */ -static bool PrintAndSelectUnusedPinsAndPadsOfElement(ElementTypePtr Element, FILE * FP) +static pcb_bool PrintAndSelectUnusedPinsAndPadsOfElement(ElementTypePtr Element, FILE * FP) { - bool first = true; + pcb_bool first = pcb_true; Cardinal number; /* check all pins in element */ @@ -46,8 +46,8 @@ if (!TEST_FLAG(TheFlag, pin) && FP) { int i; if (ADD_PV_TO_LIST(pin, 0, NULL, 0)) - return true; - DoIt(true, true); + return pcb_true; + DoIt(pcb_true, pcb_true); number = PadList[COMPONENT_LAYER].Number + PadList[SOLDER_LAYER].Number + PVList.Number; /* the pin has no connection if it's the only * list entry; don't count vias @@ -59,7 +59,7 @@ /* output of element name if not already done */ if (first) { PrintConnectionElementName(Element, FP); - first = false; + first = pcb_false; } /* write name to list and draw selected object */ @@ -72,7 +72,7 @@ /* reset found objects for the next pin */ if (PrepareNextLoop(FP)) - return (true); + return (pcb_true); } } } @@ -87,8 +87,8 @@ int i; if (ADD_PAD_TO_LIST(TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, 0, NULL, 0)) - return true; - DoIt(true, true); + return pcb_true; + DoIt(pcb_true, pcb_true); number = PadList[COMPONENT_LAYER].Number + PadList[SOLDER_LAYER].Number + PVList.Number; /* the pin has no connection if it's the only * list entry; don't count vias @@ -100,7 +100,7 @@ /* output of element name if not already done */ if (first) { PrintConnectionElementName(Element, FP); - first = false; + first = pcb_false; } /* write name to list and draw selected object */ @@ -114,7 +114,7 @@ /* reset found objects for the next pin */ if (PrepareNextLoop(FP)) - return (true); + return (pcb_true); } } END_LOOP; @@ -124,13 +124,13 @@ fputs("}\n\n", FP); SEPARATE(FP); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * resets some flags for looking up the next pin/pad */ -static bool PrepareNextLoop(FILE * FP) +static pcb_bool PrepareNextLoop(FILE * FP) { Cardinal layer; @@ -149,15 +149,15 @@ PVList.Number = PVList.Location = 0; RatList.Number = RatList.Location = 0; - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * finds all connections to the pins of the passed element. * The result is written to file FP - * Returns true if operation was aborted + * Returns pcb_true if operation was aborted */ -static bool PrintElementConnections(ElementTypePtr Element, FILE * FP, bool AndDraw) +static pcb_bool PrintElementConnections(ElementTypePtr Element, FILE * FP, pcb_bool AndDraw) { PrintConnectionElementName(Element, FP); @@ -166,20 +166,20 @@ { /* pin might have been checked before, add to list if not */ if (TEST_FLAG(TheFlag, pin)) { - PrintConnectionListEntry((char *) EMPTY(pin->Name), NULL, true, FP); + PrintConnectionListEntry((char *) EMPTY(pin->Name), NULL, pcb_true, FP); fputs("\t\t__CHECKED_BEFORE__\n\t}\n", FP); continue; } if (ADD_PV_TO_LIST(pin, PCB_TYPE_ELEMENT, Element, FCT_ELEMENT)) - return true; - DoIt(true, AndDraw); + return pcb_true; + DoIt(pcb_true, AndDraw); /* printout all found connections */ - PrintPinConnections(FP, true); - PrintPadConnections(COMPONENT_LAYER, FP, false); - PrintPadConnections(SOLDER_LAYER, FP, false); + PrintPinConnections(FP, pcb_true); + PrintPadConnections(COMPONENT_LAYER, FP, pcb_false); + PrintPadConnections(SOLDER_LAYER, FP, pcb_false); fputs("\t}\n", FP); if (PrepareNextLoop(FP)) - return (true); + return (pcb_true); } END_LOOP; @@ -189,25 +189,25 @@ Cardinal layer; /* pad might have been checked before, add to list if not */ if (TEST_FLAG(TheFlag, pad)) { - PrintConnectionListEntry((char *) EMPTY(pad->Name), NULL, true, FP); + PrintConnectionListEntry((char *) EMPTY(pad->Name), NULL, pcb_true, FP); fputs("\t\t__CHECKED_BEFORE__\n\t}\n", FP); continue; } layer = TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER; if (ADD_PAD_TO_LIST(layer, pad, PCB_TYPE_ELEMENT, Element, FCT_ELEMENT)) - return true; - DoIt(true, AndDraw); + return pcb_true; + DoIt(pcb_true, AndDraw); /* print all found connections */ - PrintPadConnections(layer, FP, true); - PrintPadConnections(layer == (COMPONENT_LAYER ? SOLDER_LAYER : COMPONENT_LAYER), FP, false); - PrintPinConnections(FP, false); + PrintPadConnections(layer, FP, pcb_true); + PrintPadConnections(layer == (COMPONENT_LAYER ? SOLDER_LAYER : COMPONENT_LAYER), FP, pcb_false); + PrintPinConnections(FP, pcb_false); fputs("\t}\n", FP); if (PrepareNextLoop(FP)) - return (true); + return (pcb_true); } END_LOOP; fputs("}\n\n", FP); - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- @@ -216,13 +216,13 @@ void LookupUnusedPins(FILE * FP) { /* reset all currently marked connections */ - User = true; - ResetConnections(true); + User = pcb_true; + ResetConnections(pcb_true); InitConnectionLookup(); ELEMENT_LOOP(PCB->Data); { - /* break if abort dialog returned true; + /* break if abort dialog returned pcb_true; * passing NULL as filedescriptor discards the normal output */ if (PrintAndSelectUnusedPinsAndPadsOfElement(element, FP)) @@ -234,7 +234,7 @@ gui->beep(); FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); - User = false; + User = pcb_false; Draw(); } @@ -244,17 +244,17 @@ void LookupElementConnections(ElementTypePtr Element, FILE * FP) { /* reset all currently marked connections */ - User = true; + User = pcb_true; TheFlag = PCB_FLAG_FOUND; - ResetConnections(true); + ResetConnections(pcb_true); InitConnectionLookup(); - PrintElementConnections(Element, FP, true); - SetChangedFlag(true); + PrintElementConnections(Element, FP, pcb_true); + SetChangedFlag(pcb_true); if (conf_core.editor.beep_when_finished) gui->beep(); FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); - User = false; + User = pcb_false; Draw(); } @@ -265,24 +265,24 @@ void LookupConnectionsToAllElements(FILE * FP) { /* reset all currently marked connections */ - User = false; + User = pcb_false; TheFlag = PCB_FLAG_FOUND; - ResetConnections(false); + ResetConnections(pcb_false); InitConnectionLookup(); ELEMENT_LOOP(PCB->Data); { - /* break if abort dialog returned true */ - if (PrintElementConnections(element, FP, false)) + /* break if abort dialog returned pcb_true */ + if (PrintElementConnections(element, FP, pcb_false)) break; SEPARATE(FP); if (conf_core.editor.reset_after_element && gdl_it_idx(&__it__) != 1) - ResetConnections(false); + ResetConnections(pcb_false); } END_LOOP; if (conf_core.editor.beep_when_finished) gui->beep(); - ResetConnections(false); + ResetConnections(pcb_false); FreeConnectionLookupMemory(); Redraw(); } Index: trunk/src/global.h =================================================================== --- trunk/src/global.h (revision 3382) +++ trunk/src/global.h (revision 3383) @@ -47,7 +47,6 @@ #include #include #include -#include #include "global_typedefs.h" #include "global_objs.h" @@ -172,7 +171,7 @@ polylist_t Polygon; arclist_t Arc; rtree_t *line_tree, *text_tree, *polygon_tree, *arc_tree; - bool On; /* visible flag */ + pcb_bool On; /* visible flag */ const char *Color; /* color */ const char *SelectedColor; AttributeListType Attributes; @@ -278,7 +277,7 @@ *PrintFilename, /* from print dialog */ *Netlistname, /* name of netlist file */ ThermStyle; /* type of thermal to place with thermal tool */ - bool Changed, /* layout has been changed */ + pcb_bool Changed, /* layout has been changed */ ViaOn, /* visibility flags */ ElementOn, RatOn, InvisibleObjectsOn, PinOn, SilkActive, /* active layer is actually silk */ RatDraw; /* we're drawing rats */ @@ -312,7 +311,7 @@ AttributeListType Attributes; DataTypePtr Data; /* entire database */ - bool is_footprint; /* If set, the user has loaded a footprint, not a pcb. */ + pcb_bool is_footprint; /* If set, the user has loaded a footprint, not a pcb. */ } PCBType, *PCBTypePtr; typedef struct { /* information about the paste buffer */ @@ -336,7 +335,7 @@ PointType Point1, /* start- and end-position */ Point2; long int State; - bool draw; + pcb_bool draw; } AttachedLineType, *AttachedLineTypePtr; typedef struct { /* currently marked block */ @@ -343,7 +342,7 @@ PointType Point1, /* start- and end-position */ Point2; long int State; - bool otherway; + pcb_bool otherway; } AttachedBoxType, *AttachedBoxTypePtr; typedef struct { /* currently attached object */ @@ -387,7 +386,7 @@ } CrosshairType, *CrosshairTypePtr; typedef struct { - bool status; + pcb_bool status; Coord X, Y; } MarkType, *MarkTypePtr; Index: trunk/src/global_objs.h =================================================================== --- trunk/src/global_objs.h (revision 3382) +++ trunk/src/global_objs.h (revision 3383) @@ -1,7 +1,6 @@ #ifndef GLOBAL_OBJS_H #define GLOBAL_OBJS_H #include -#include #include "config.h" #include "globalconst.h" #include "global_typedefs.h" @@ -156,7 +155,7 @@ */ typedef struct symbol_st { /* a single symbol */ LineTypePtr Line; - bool Valid; + pcb_bool Valid; Cardinal LineN, /* number of lines */ LineMax; Coord Width, Height, /* size of cell */ @@ -168,7 +167,7 @@ MaxWidth; BoxType DefaultSymbol; /* the default symbol is a filled box */ SymbolType Symbol[MAX_FONTPOSITION + 1]; - bool Valid; + pcb_bool Valid; } FontType, *FontTypePtr; Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 3382) +++ trunk/src/global_typedefs.h (revision 3383) @@ -44,6 +44,8 @@ #endif typedef unsigned char BYTE; +#include "pcb_bool.h" + #include "unit.h" #endif Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 3382) +++ trunk/src/gui_act.c (revision 3383) @@ -262,7 +262,7 @@ break; case F_CycleClip: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); if (conf_core.editor.all_direction_lines) { conf_toggle_editor(all_direction_lines); conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",0); @@ -271,27 +271,27 @@ conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3); } AdjustAttachedObjects(); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; case F_CycleCrosshair: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); Crosshair.shape = CrosshairShapeIncrement(Crosshair.shape); if (Crosshair_Shapes_Number == Crosshair.shape) Crosshair.shape = Basic_Crosshair_Shape; - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; case F_ToggleRubberBandMode: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); conf_toggle_editor(rubber_band_mode); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; case F_ToggleStartDirection: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); conf_toggle_editor(swap_start_direction); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; case F_ToggleUniqueNames: @@ -299,21 +299,21 @@ break; case F_ToggleSnapPin: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); conf_toggle_editor(snap_pin); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; case F_ToggleSnapOffGridLine: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); conf_toggle_editor(snap_offgrid_line); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; case F_ToggleHighlightOnPoint: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); conf_toggle_editor(highlight_on_point); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; case F_ToggleLocalRef: @@ -358,17 +358,17 @@ break; case F_ToggleAutoDRC: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); conf_toggle_editor(auto_drc); if (conf_core.editor.auto_drc && conf_core.editor.mode == PCB_MODE_LINE) { - if (ResetConnections(true)) { + if (ResetConnections(pcb_true)) { IncrementUndoSerialNumber(); Draw(); } if (Crosshair.AttachedLine.State != STATE_FIRST) - LookupConnection(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, true, 1, PCB_FLAG_FOUND); + LookupConnection(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, pcb_true, 1, PCB_FLAG_FOUND); } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; case F_ToggleCheckPlanes: @@ -405,8 +405,8 @@ PCB->Grid = 1; if (MoveCrosshairAbsolute(Crosshair.X, Crosshair.Y)) - notify_crosshair_change(true); /* first notify was in MoveCrosshairAbs */ - SetGrid(oldGrid, true); + notify_crosshair_change(pcb_true); /* first notify was in MoveCrosshairAbs */ + SetGrid(oldGrid, pcb_true); } break; @@ -462,7 +462,7 @@ TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, pad); } END_LOOP; - SetChangedFlag(true); + SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); Draw(); break; @@ -474,7 +474,7 @@ DrawPinName((PinTypePtr) ptr2); AddObjectToFlagUndoList(PCB_TYPE_PIN, ptr1, ptr2, ptr3); TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (PinTypePtr) ptr2); - SetChangedFlag(true); + SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); Draw(); break; @@ -486,7 +486,7 @@ DrawPadName((PadTypePtr) ptr2); AddObjectToFlagUndoList(PCB_TYPE_PAD, ptr1, ptr2, ptr3); TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (PadTypePtr) ptr2); - SetChangedFlag(true); + SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); Draw(); break; @@ -497,7 +497,7 @@ DrawViaName((PinTypePtr) ptr2); AddObjectToFlagUndoList(PCB_TYPE_VIA, ptr1, ptr2, ptr3); TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (PinTypePtr) ptr2); - SetChangedFlag(true); + SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); Draw(); break; @@ -597,7 +597,7 @@ if (function) { Note.X = Crosshair.X; Note.Y = Crosshair.Y; - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); switch (funchash_get(function, NULL)) { case F_Arc: SetMode(PCB_MODE_ARC); @@ -749,7 +749,7 @@ SetMode(PCB_MODE_POLYGON); else { SaveMode(); - saved_mode = true; + saved_mode = pcb_true; SetMode(PCB_MODE_ARROW); NotifyMode(); } @@ -772,7 +772,7 @@ SaveMode(); break; } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } @@ -914,7 +914,7 @@ case F_SelectedElements: case F_Selected: { - bool changed = false; + pcb_bool changed = pcb_false; ELEMENT_LOOP(PCB->Data); { if ((TEST_FLAG(PCB_FLAG_SELECTED, element) || TEST_FLAG(PCB_FLAG_SELECTED, &NAMEONPCB_TEXT(element))) @@ -923,7 +923,7 @@ EraseElementName(element); TOGGLE_FLAG(PCB_FLAG_HIDENAME, element); DrawElementName(element); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -962,25 +962,25 @@ const char *function = ACTION_ARG(0); if (!function || !*function) { if (Marked.status) { - notify_mark_change(false); - Marked.status = false; - notify_mark_change(true); + notify_mark_change(pcb_false); + Marked.status = pcb_false; + notify_mark_change(pcb_true); } else { - notify_mark_change(false); - Marked.status = false; - Marked.status = true; + notify_mark_change(pcb_false); + Marked.status = pcb_false; + Marked.status = pcb_true; Marked.X = Crosshair.X; Marked.Y = Crosshair.Y; - notify_mark_change(true); + notify_mark_change(pcb_true); } } else if (funchash_get(function, NULL) == F_Center) { - notify_mark_change(false); - Marked.status = true; + notify_mark_change(pcb_false); + Marked.status = pcb_true; Marked.X = Crosshair.X; Marked.Y = Crosshair.Y; - notify_mark_change(true); + notify_mark_change(pcb_true); } return 0; } @@ -1020,8 +1020,8 @@ if (number > 0 && number <= vtroutestyle_len(&PCB->RouteStyle)) { rts = &PCB->RouteStyle.array[number - 1]; SetLineSize(rts->Thick); - SetViaSize(rts->Diameter, true); - SetViaDrillingHole(rts->Hole, true); + SetViaSize(rts->Diameter, pcb_true); + SetViaDrillingHole(rts->Hole, pcb_true); SetClearanceWidth(rts->Clearance); hid_action("RouteStylesChanged"); } @@ -1093,22 +1093,22 @@ /* set layer current and size from line or arc */ switch (type) { case PCB_TYPE_LINE: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); set_same_(((LineTypePtr) ptr2)->Thickness, 0, 0, ((LineTypePtr) ptr2)->Clearance / 2, NULL); layer = (LayerTypePtr) ptr1; if (conf_core.editor.mode != PCB_MODE_LINE) SetMode(PCB_MODE_LINE); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); hid_action("RouteStylesChanged"); break; case PCB_TYPE_ARC: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); set_same_(((ArcTypePtr) ptr2)->Thickness, 0, 0, ((ArcTypePtr) ptr2)->Clearance / 2, NULL); layer = (LayerTypePtr) ptr1; if (conf_core.editor.mode != PCB_MODE_ARC) SetMode(PCB_MODE_ARC); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); hid_action("RouteStylesChanged"); break; @@ -1117,11 +1117,11 @@ break; case PCB_TYPE_VIA: - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); set_same_(0, ((PinTypePtr) ptr2)->Thickness, ((PinTypePtr) ptr2)->DrillingHole, ((PinTypePtr) ptr2)->Clearance / 2, NULL); if (conf_core.editor.mode != PCB_MODE_VIA) SetMode(PCB_MODE_VIA); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); hid_action("RouteStylesChanged"); break; @@ -1129,7 +1129,7 @@ return 1; } if (layer != CURRENT) { - ChangeGroupVisibility(GetLayerNumber(PCB->Data, layer), true, true); + ChangeGroupVisibility(GetLayerNumber(PCB->Data, layer), pcb_true, pcb_true); Redraw(); } return 0; Index: trunk/src/hid.h =================================================================== --- trunk/src/hid.h (revision 3382) +++ trunk/src/hid.h (revision 3383) @@ -2,7 +2,6 @@ #define PCB_HID_H #include -#include #include "config.h" #include "error.h" @@ -206,13 +205,13 @@ /* This may be called to ask the GUI to force a redraw of a given area */ void (*invalidate_lr) (int left_, int right_, int top_, int bottom_); void (*invalidate_all) (void); - void (*notify_crosshair_change) (bool changes_complete); - void (*notify_mark_change) (bool changes_complete); + void (*notify_crosshair_change) (pcb_bool changes_complete); + void (*notify_mark_change) (pcb_bool changes_complete); /* During redraw or print/export cycles, this is called once per layer (or layer group, for copper layers). If it returns false (zero), the HID does not want that layer, and none of the drawing - functions should be called. If it returns true (nonzero), the + functions should be called. If it returns pcb_true (nonzero), the items in that layer [group] should be drawn using the various drawing functions. In addition to the MAX_LAYERS copper layer groups, you may select layers indicated by the macros SL_* @@ -281,10 +280,10 @@ void (*fill_polygon) (hidGC gc_, int n_coords_, Coord * x_, Coord * y_); void (*fill_pcb_polygon) (hidGC gc_, PolygonType * poly, const BoxType * clip_box); void (*thindraw_pcb_polygon) (hidGC gc_, PolygonType * poly, const BoxType * clip_box); - void (*fill_pcb_pad) (hidGC gc_, PadType * pad, bool clip, bool mask); - void (*thindraw_pcb_pad) (hidGC gc_, PadType * pad, bool clip, bool mask); - void (*fill_pcb_pv) (hidGC fg_gc, hidGC bg_gc, PinType * pv, bool drawHole, bool mask); - void (*thindraw_pcb_pv) (hidGC fg_gc, hidGC bg_gc, PinType * pv, bool drawHole, bool mask); + void (*fill_pcb_pad) (hidGC gc_, PadType * pad, pcb_bool clip, pcb_bool mask); + void (*thindraw_pcb_pad) (hidGC gc_, PadType * pad, pcb_bool clip, pcb_bool mask); + void (*fill_pcb_pv) (hidGC fg_gc, hidGC bg_gc, PinType * pv, pcb_bool drawHole, pcb_bool mask); + void (*thindraw_pcb_pv) (hidGC fg_gc, hidGC bg_gc, PinType * pv, pcb_bool drawHole, pcb_bool mask); void (*fill_rect) (hidGC gc_, Coord x1_, Coord y1_, Coord x2_, Coord y2_); @@ -475,12 +474,12 @@ /* Notification to the GUI around saving the PCB file. * * Called with a false parameter before the save, called again - * with true after the save. + * with pcb_true after the save. * * Allows GUIs which watch for file-changes on disk to ignore * our deliberate changes. */ - void (*notify_save_pcb) (const char *filename, bool done); + void (*notify_save_pcb) (const char *filename, pcb_bool done); /* Notification to the GUI that the PCB file has been renamed. */ void (*notify_filename_changed) (void); Index: trunk/src/hid_draw_helpers.c =================================================================== --- trunk/src/hid_draw_helpers.c (revision 3382) +++ trunk/src/hid_draw_helpers.c (revision 3383) @@ -175,7 +175,7 @@ PolygonHoles(poly, clip_box, thindraw_hole_cb, gc); } -void common_thindraw_pcb_pad(hidGC gc, PadType * pad, bool clear, bool mask) +void common_thindraw_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) { Coord w = clear ? (mask ? pad->Mask : pad->Thickness + pad->Clearance) : pad->Thickness; @@ -239,7 +239,7 @@ } } -void common_fill_pcb_pad(hidGC gc, PadType * pad, bool clear, bool mask) +void common_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) { Coord w = clear ? (mask ? pad->Mask : pad->Thickness + pad->Clearance) : pad->Thickness; @@ -337,7 +337,7 @@ } -void common_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pv, bool drawHole, bool mask) +void common_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pv, pcb_bool drawHole, pcb_bool mask) { Coord w = mask ? pv->Mask : pv->Thickness; Coord r = w / 2; @@ -364,10 +364,10 @@ gui->fill_rect(fg_gc, l, b, r, t); } else - draw_square_pin_poly(fg_gc, pv->X, pv->Y, w, false, GET_SQUARE(pv)); + draw_square_pin_poly(fg_gc, pv->X, pv->Y, w, pcb_false, GET_SQUARE(pv)); } else if (TEST_FLAG(PCB_FLAG_OCTAGON, pv)) - draw_octagon_poly(fg_gc, pv->X, pv->Y, w, false); + draw_octagon_poly(fg_gc, pv->X, pv->Y, w, pcb_false); else /* draw a round pin or via */ gui->fill_circle(fg_gc, pv->X, pv->Y, r); @@ -376,7 +376,7 @@ gui->fill_circle(bg_gc, pv->X, pv->Y, pv->DrillingHole / 2); } -void common_thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pv, bool drawHole, bool mask) +void common_thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pv, pcb_bool drawHole, pcb_bool mask) { Coord w = mask ? pv->Mask : pv->Thickness; Coord r = w / 2; @@ -408,7 +408,7 @@ } else if (TEST_FLAG(PCB_FLAG_OCTAGON, pv)) { - draw_octagon_poly(fg_gc, pv->X, pv->Y, w, true); + draw_octagon_poly(fg_gc, pv->X, pv->Y, w, pcb_true); } else { /* draw a round pin or via */ Index: trunk/src/hid_draw_helpers.h =================================================================== --- trunk/src/hid_draw_helpers.h (revision 3382) +++ trunk/src/hid_draw_helpers.h (revision 3383) @@ -2,9 +2,9 @@ #define PCB_HID_DRAW_HELPERS_H void common_fill_pcb_polygon(hidGC gc, PolygonType * poly, const BoxType * clip_box); void common_thindraw_pcb_polygon(hidGC gc, PolygonType * poly, const BoxType * clip_box); -void common_fill_pcb_pad(hidGC gc, PadType * pad, bool clear, bool mask); -void common_thindraw_pcb_pad(hidGC gc, PadType * pad, bool clear, bool mask); -void common_fill_pcb_pv(hidGC gc, PinType * pv, bool drawHole, bool mask); -void common_thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pv, bool drawHole, bool mask); +void common_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask); +void common_thindraw_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask); +void common_fill_pcb_pv(hidGC gc, PinType * pv, pcb_bool drawHole, pcb_bool mask); +void common_thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pv, pcb_bool drawHole, pcb_bool mask); void common_draw_helpers_init(HID * hid); #endif Index: trunk/src/hid_extents.c =================================================================== --- trunk/src/hid_extents.c (revision 3382) +++ trunk/src/hid_extents.c (revision 3383) @@ -134,7 +134,7 @@ void hid_extents_init(void) { - static bool initialised = false; + static pcb_bool initialised = pcb_false; if (initialised) return; @@ -163,7 +163,7 @@ extents_hid.fill_polygon = extents_fill_polygon; extents_hid.fill_rect = extents_fill_rect; - initialised = true; + initialised = pcb_true; } BoxType *hid_get_extents(void *item) Index: trunk/src/hid_nogui.c =================================================================== --- trunk/src/hid_nogui.c (revision 3382) +++ trunk/src/hid_nogui.c (revision 3383) @@ -124,22 +124,22 @@ CRASH("fill_pcb_polygon"); } -static void nogui_fill_pcb_pad(hidGC gc, PadType * pad, bool clear, bool mask) +static void nogui_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) { CRASH("fill_pcb_pad"); } -static void nogui_thindraw_pcb_pad(hidGC gc, PadType * pad, bool clear, bool mask) +static void nogui_thindraw_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) { CRASH("thindraw_pcb_pad"); } -static void nogui_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pad, bool drawHole, bool mask) +static void nogui_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pad, pcb_bool drawHole, pcb_bool mask) { CRASH("fill_pcb_pv"); } -static void nogui_thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pad, bool drawHole, bool mask) +static void nogui_thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pad, pcb_bool drawHole, pcb_bool mask) { CRASH("thindraw_pcb_pv"); } @@ -280,7 +280,7 @@ { char *answer; int ret = 0; - bool valid_answer = false; + pcb_bool valid_answer = pcb_false; va_list args; do { @@ -297,12 +297,12 @@ if (answer[0] == '0' && answer[1] == '\0') { ret = 0; - valid_answer = true; + valid_answer = pcb_true; } if (answer[0] == '1' && answer[1] == '\0') { ret = 1; - valid_answer = true; + valid_answer = pcb_true; } free(answer); Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 3382) +++ trunk/src/insert.c (revision 3383) @@ -58,8 +58,8 @@ */ static Coord InsertX, InsertY; /* used by local routines as offset */ static Cardinal InsertAt; -static bool InsertLast; -static bool Forcible; +static pcb_bool InsertLast; +static pcb_bool Forcible; static ObjectFunctionType InsertFunctions = { InsertPointIntoLine, NULL, @@ -170,7 +170,7 @@ Polygon->HoleIndex[n]++; Polygon->Points[InsertAt] = save; - SetChangedFlag(true); + SetChangedFlag(pcb_true); AddObjectToInsertPointUndoList(PCB_TYPE_POLYGON_POINT, Layer, Polygon, &Polygon->Points[InsertAt]); SetPolygonBoundingBox(Polygon); @@ -186,7 +186,7 @@ /* --------------------------------------------------------------------------- * inserts point into objects */ -void *InsertPointIntoObject(int Type, void *Ptr1, void *Ptr2, Cardinal * Ptr3, Coord DX, Coord DY, bool Force, bool insert_last) +void *InsertPointIntoObject(int Type, void *Ptr1, void *Ptr2, Cardinal * Ptr3, Coord DX, Coord DY, pcb_bool Force, pcb_bool insert_last) { void *ptr; Index: trunk/src/insert.h =================================================================== --- trunk/src/insert.h (revision 3382) +++ trunk/src/insert.h (revision 3383) @@ -36,7 +36,7 @@ /* --------------------------------------------------------------------------- * prototypes */ -void *InsertPointIntoObject(int, void *, void *, Cardinal *, Coord, Coord, bool, bool); +void *InsertPointIntoObject(int, void *, void *, Cardinal *, Coord, Coord, pcb_bool, pcb_bool); PointTypePtr AdjustInsertPoint(void); #endif Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 3382) +++ trunk/src/layer.c (revision 3383) @@ -38,30 +38,30 @@ */ static struct { - bool ElementOn, InvisibleObjectsOn, PinOn, ViaOn, RatOn; + pcb_bool ElementOn, InvisibleObjectsOn, PinOn, ViaOn, RatOn; int LayerStack[MAX_LAYER]; - bool LayerOn[MAX_LAYER]; + pcb_bool LayerOn[MAX_LAYER]; int cnt; } SavedStack; -bool IsLayerEmpty(LayerTypePtr layer) +pcb_bool IsLayerEmpty(LayerTypePtr layer) { return LAYER_IS_EMPTY(layer); } -bool IsLayerNumEmpty(int num) +pcb_bool IsLayerNumEmpty(int num) { return IsLayerEmpty(PCB->Data->Layer + num); } -bool IsLayerGroupEmpty(int num) +pcb_bool IsLayerGroupEmpty(int num) { int i; for (i = 0; i < PCB->LayerGroups.Number[num]; i++) if (!IsLayerNumEmpty(PCB->LayerGroups.Entries[num][i])) - return false; - return true; + return pcb_false; + return pcb_true; } /* ---------------------------------------------------------------------- @@ -71,8 +71,8 @@ int ParseGroupString(const char *s, LayerGroupTypePtr LayerGroup, int LayerN) { int group, member, layer; - bool c_set = false, /* flags for the two special layers to */ - s_set = false; /* provide a default setting for old formats */ + pcb_bool c_set = pcb_false, /* flags for the two special layers to */ + s_set = pcb_false; /* provide a default setting for old formats */ int groupnum[MAX_LAYER + 2]; /* clear struct */ @@ -98,7 +98,7 @@ case 't': case 'T': layer = LayerN + COMPONENT_LAYER; - c_set = true; + c_set = pcb_true; break; case 's': @@ -106,7 +106,7 @@ case 'b': case 'B': layer = LayerN + SOLDER_LAYER; - s_set = true; + s_set = pcb_true; break; default: @@ -193,7 +193,7 @@ * changes the visibility of all layers in a group * returns the number of changed layers */ -int ChangeGroupVisibility(int Layer, bool On, bool ChangeStackOrder) +int ChangeGroupVisibility(int Layer, pcb_bool On, pcb_bool ChangeStackOrder) { int group, i, changed = 1; /* at least the current layer changes */ @@ -269,13 +269,13 @@ for (i = 0; i < max_copper_layer + 2; i++) { if (i < max_copper_layer) LayerStack[i] = i; - PCB->Data->Layer[i].On = false; + PCB->Data->Layer[i].On = pcb_false; } - PCB->ElementOn = false; - PCB->InvisibleObjectsOn = false; - PCB->PinOn = false; - PCB->ViaOn = false; - PCB->RatOn = false; + PCB->ElementOn = pcb_false; + PCB->InvisibleObjectsOn = pcb_false; + PCB->PinOn = pcb_false; + PCB->ViaOn = pcb_false; + PCB->RatOn = pcb_false; conf_set_editor(show_mask, 0); conf_set_editor(show_solder_side, 0); @@ -282,15 +282,15 @@ for (i = argn - 1; i >= 0; i--) { if (strcasecmp(args[i], "rats") == 0) - PCB->RatOn = true; + PCB->RatOn = pcb_true; else if (strcasecmp(args[i], "invisible") == 0) - PCB->InvisibleObjectsOn = true; + PCB->InvisibleObjectsOn = pcb_true; else if (strcasecmp(args[i], "pins") == 0) - PCB->PinOn = true; + PCB->PinOn = pcb_true; else if (strcasecmp(args[i], "vias") == 0) - PCB->ViaOn = true; + PCB->ViaOn = pcb_true; else if (strcasecmp(args[i], "elements") == 0 || strcasecmp(args[i], "silk") == 0) - PCB->ElementOn = true; + PCB->ElementOn = pcb_true; else if (strcasecmp(args[i], "mask") == 0) conf_set_editor(show_mask, 1); else if (strcasecmp(args[i], "solderside") == 0) @@ -297,13 +297,13 @@ conf_set_editor(show_solder_side, 1); else if (isdigit((int) args[i][0])) { lno = atoi(args[i]); - ChangeGroupVisibility(lno, true, true); + ChangeGroupVisibility(lno, pcb_true, pcb_true); } else { int found = 0; for (lno = 0; lno < max_copper_layer; lno++) if (strcasecmp(args[i], PCB->Data->Layer[lno].Name) == 0) { - ChangeGroupVisibility(lno, true, true); + ChangeGroupVisibility(lno, pcb_true, pcb_true); found = 1; break; } @@ -378,13 +378,13 @@ for (i = 0; i < max_copper_layer + 2; i++) { if (i < max_copper_layer) LayerStack[i] = i; - PCB->Data->Layer[i].On = true; + PCB->Data->Layer[i].On = pcb_true; } - PCB->ElementOn = true; - PCB->InvisibleObjectsOn = true; - PCB->PinOn = true; - PCB->ViaOn = true; - PCB->RatOn = true; + PCB->ElementOn = pcb_true; + PCB->InvisibleObjectsOn = pcb_true; + PCB->PinOn = pcb_true; + PCB->ViaOn = pcb_true; + PCB->RatOn = pcb_true; /* Bring the component group to the front and make it active. */ comp_group = GetLayerGroupNumberByNumber(component_silk_layer); @@ -397,11 +397,11 @@ void SaveStackAndVisibility(void) { Cardinal i; - static bool run = false; + static pcb_bool run = pcb_false; - if (run == false) { + if (run == pcb_false) { SavedStack.cnt = 0; - run = true; + run = pcb_true; } if (SavedStack.cnt != 0) { Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 3382) +++ trunk/src/layer.h (revision 3383) @@ -27,12 +27,12 @@ /* prototypes for layer manipulation */ -/* Returns true if the given layer is empty (there are no objects on the layer) */ -bool IsLayerEmpty(LayerTypePtr); -bool IsLayerNumEmpty(int); +/* Returns pcb_true if the given layer is empty (there are no objects on the layer) */ +pcb_bool IsLayerEmpty(LayerTypePtr); +pcb_bool IsLayerNumEmpty(int); -/* Returns true if all layers in a group are empty */ -bool IsLayerGroupEmpty(int); +/* Returns pcb_true if all layers in a group are empty */ +pcb_bool IsLayerGroupEmpty(int); /************ OLD API - new code should not use these **************/ @@ -43,7 +43,7 @@ int GetLayerGroupNumberByPointer(LayerTypePtr); int GetLayerGroupNumberByNumber(Cardinal); int GetGroupOfLayer(int); -int ChangeGroupVisibility(int, bool, bool); +int ChangeGroupVisibility(int, pcb_bool, pcb_bool); void LayerStringToLayerStack(const char *); /* Layer Group Functions */ Index: trunk/src/line.c =================================================================== --- trunk/src/line.c (revision 3382) +++ trunk/src/line.c (revision 3383) @@ -40,7 +40,7 @@ #include "rtree.h" #include "layer.h" -static double drc_lines(PointTypePtr end, bool way); +static double drc_lines(PointTypePtr end, pcb_bool way); /* --------------------------------------------------------------------------- * Adjust the attached line to 45 degrees if necessary @@ -54,11 +54,11 @@ return; /* don't draw outline when ctrl key is pressed */ if (conf_core.editor.mode == PCB_MODE_LINE && gui->control_is_pressed()) { - line->draw = false; + line->draw = pcb_false; return; } else - line->draw = true; + line->draw = pcb_true; /* no 45 degree lines required */ if (PCB->RatDraw || conf_core.editor.all_direction_lines) { line->Point2.X = Crosshair.X; @@ -150,7 +150,7 @@ /* --------------------------------------------------------------------------- * adjusts the insert lines to make them 45 degrees as necessary */ -void AdjustTwoLine(bool way) +void AdjustTwoLine(pcb_bool way) { Coord dx, dy; AttachedLineTypePtr line = &Crosshair.AttachedLine; @@ -159,11 +159,11 @@ return; /* don't draw outline when ctrl key is pressed */ if (gui->control_is_pressed()) { - line->draw = false; + line->draw = pcb_false; return; } else - line->draw = true; + line->draw = pcb_true; if (conf_core.editor.all_direction_lines) { line->Point2.X = Crosshair.X; line->Point2.Y = Crosshair.Y; @@ -198,7 +198,7 @@ struct drc_info { LineTypePtr line; - bool solder; + pcb_bool solder; jmp_buf env; }; @@ -244,7 +244,7 @@ /* drc_lines() checks for intersectors against two lines and * adjusts the end point until there is no intersection or - * it winds up back at the start. If way is false it checks + * it winds up back at the start. If way is pcb_false it checks * an ortho start line with one 45 refraction to reach the endpoint, * otherwise it checks a 45 start, with a ortho refraction to reach endpoint * @@ -252,7 +252,7 @@ * changes the position of the input end point to the best answer. */ -static double drc_lines(PointTypePtr end, bool way) +static double drc_lines(PointTypePtr end, pcb_bool way) { double f, s, f2, s2, len, best; Coord dx, dy, temp, last, length; @@ -260,7 +260,7 @@ LineType line1, line2; Cardinal group, comp; struct drc_info info; - bool two_lines, x_is_long, blocker; + pcb_bool two_lines, x_is_long, blocker; PointType ans; f = 1.0; @@ -275,19 +275,19 @@ dy = end->Y - line1.Point1.Y; dx = end->X - line1.Point1.X; if (coord_abs(dx) > coord_abs(dy)) { - x_is_long = true; + x_is_long = pcb_true; length = coord_abs(dx); } else { - x_is_long = false; + x_is_long = pcb_false; length = coord_abs(dy); } group = GetGroupOfLayer(INDEXOFCURRENT); comp = max_group + 10; /* this out-of-range group might save a call */ if (GetLayerGroupNumberByNumber(solder_silk_layer) == group) - info.solder = true; + info.solder = pcb_true; else { - info.solder = false; + info.solder = pcb_false; comp = GetLayerGroupNumberByNumber(component_silk_layer); } temp = length; @@ -311,13 +311,13 @@ f2 = 1.0; s2 = 0.5; last2 = -1; - blocker = true; + blocker = pcb_true; while (length2 != last2) { if (x_is_long) dy = SGN(dy) * length2; else dx = SGN(dx) * length2; - two_lines = true; + two_lines = pcb_true; if (coord_abs(dx) > coord_abs(dy) && x_is_long) { line1.Point2.X = line1.Point1.X + (way ? SGN(dx) * coord_abs(dy) : dx - SGN(dx) * coord_abs(dy)); line1.Point2.Y = line1.Point1.Y + (way ? dy : 0); @@ -330,13 +330,13 @@ /* we've changed which axis is long, so only do one line */ line1.Point2.X = line1.Point1.X + dx; line1.Point2.Y = line1.Point1.Y + (way ? SGN(dy) * coord_abs(dx) : 0); - two_lines = false; + two_lines = pcb_false; } else { /* we've changed which axis is long, so only do one line */ line1.Point2.Y = line1.Point1.Y + dy; line1.Point2.X = line1.Point1.X + (way ? SGN(dx) * coord_abs(dy) : 0); - two_lines = false; + two_lines = pcb_false; } line2.Point1.X = line1.Point2.X; line2.Point1.Y = line1.Point2.Y; @@ -377,7 +377,7 @@ } END_LOOP; /* no intersector! */ - blocker = false; + blocker = pcb_false; f2 += s2; len = (line2.Point2.X - line1.Point1.X); len *= len; @@ -416,7 +416,7 @@ void EnforceLineDRC(void) { PointType r45, rs; - bool shift; + pcb_bool shift; double r1, r2; int refraction = conf_core.editor.line_refraction; @@ -429,9 +429,9 @@ rs.X = r45.X = Crosshair.X; rs.Y = r45.Y = Crosshair.Y; /* first try starting straight */ - r1 = drc_lines(&rs, false); + r1 = drc_lines(&rs, pcb_false); /* then try starting at 45 */ - r2 = drc_lines(&r45, true); + r2 = drc_lines(&r45, pcb_true); /* shift forces the line lookahead path to refract the alternate way */ shift = gui->shift_is_pressed(); if (XOR(r1 > r2, shift)) { Index: trunk/src/line.h =================================================================== --- trunk/src/line.h (revision 3382) +++ trunk/src/line.h (revision 3383) @@ -36,7 +36,7 @@ * prototypes */ void AdjustAttachedLine(void); -void AdjustTwoLine(bool); +void AdjustTwoLine(pcb_bool); void FortyFiveLine(AttachedLineTypePtr); void EnforceLineDRC(void); #endif Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 3382) +++ trunk/src/main.c (revision 3383) @@ -456,7 +456,7 @@ /* keep filename even if initial load command failed; * file might not exist */ - if (LoadPCB(command_line_pcb, NULL, true, 0)) + if (LoadPCB(command_line_pcb, NULL, pcb_true, 0)) PCB->Filename = pcb_strdup(command_line_pcb); } Index: trunk/src/misc.c =================================================================== --- trunk/src/misc.c (revision 3382) +++ trunk/src/misc.c (revision 3383) @@ -342,7 +342,7 @@ Coord minx, miny, maxx, maxy, tx; Coord min_final_radius; Coord min_unscaled_radius; - bool first_time = true; + pcb_bool first_time = pcb_true; minx = miny = maxx = maxy = tx = 0; @@ -373,7 +373,7 @@ if (first_time) { minx = maxx = line->Point1.X; miny = maxy = line->Point1.Y; - first_time = false; + first_time = pcb_false; } minx = MIN(minx, line->Point1.X - unscaled_radius + tx); @@ -442,11 +442,11 @@ } /* --------------------------------------------------------------------------- - * returns true if data area is empty + * returns pcb_true if data area is empty */ -bool IsDataEmpty(DataTypePtr Data) +pcb_bool IsDataEmpty(DataTypePtr Data) { - bool hasNoObjects; + pcb_bool hasNoObjects; Cardinal i; hasNoObjects = (pinlist_length(&Data->Via) == 0); @@ -465,13 +465,13 @@ /* FLAG(DataEmpty,FlagIsDataEmpty,0) */ /* FLAG(DataNonEmpty,FlagIsDataEmpty,1) */ -bool IsPasteEmpty(int side) +pcb_bool IsPasteEmpty(int side) { - bool paste_empty = true; + pcb_bool paste_empty = pcb_true; ALLPAD_LOOP(PCB->Data); { if (ON_SIDE(pad, side) && !TEST_FLAG(PCB_FLAG_NOPASTE, pad) && pad->Mask > 0) { - paste_empty = false; + paste_empty = pcb_false; break; } } @@ -599,7 +599,7 @@ Coord save_grid = PCB->Grid; PCB->Grid = 1; if (MoveCrosshairAbsolute(X, Y)) - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); gui->set_crosshair(Crosshair.X, Crosshair.Y, HID_SC_WARP_POINTER); PCB->Grid = save_grid; } @@ -902,7 +902,7 @@ */ char *UniqueElementName(DataTypePtr Data, char *Name) { - bool unique = true; + pcb_bool unique = pcb_true; /* null strings are ok */ if (!Name || !*Name) return (Name); @@ -912,7 +912,7 @@ { if (NAMEONPCB_NAME(element) && NSTRCMP(NAMEONPCB_NAME(element), Name) == 0) { Name = BumpName(Name); - unique = false; + unique = pcb_false; break; } } @@ -919,7 +919,7 @@ END_LOOP; if (unique) return (Name); - unique = true; + unique = pcb_true; } } @@ -984,7 +984,7 @@ Crosshair.AttachedObject.X = PlaceX - mx; Crosshair.AttachedObject.Y = PlaceY - my; if (!Marked.status || conf_core.editor.local_ref) - SetLocalRef(PlaceX - mx, PlaceY - my, true); + SetLocalRef(PlaceX - mx, PlaceY - my, pcb_true); Crosshair.AttachedObject.State = STATE_SECOND; /* get boundingbox of object and set cursor range */ @@ -1217,8 +1217,8 @@ int ElementOrientation(ElementType * e) { Coord pin1x, pin1y, pin2x, pin2y, dx, dy; - bool found_pin1 = 0; - bool found_pin2 = 0; + pcb_bool found_pin1 = 0; + pcb_bool found_pin2 = 0; /* in case we don't find pin 1 or 2, make sure we have initialized these variables */ pin1x = 0; Index: trunk/src/misc.h =================================================================== --- trunk/src/misc.h (revision 3382) +++ trunk/src/misc.h (revision 3383) @@ -46,8 +46,8 @@ void SetPadBoundingBox(PadTypePtr); void SetPolygonBoundingBox(PolygonTypePtr); void SetElementBoundingBox(DataTypePtr, ElementTypePtr, FontTypePtr); -bool IsDataEmpty(DataTypePtr); -bool IsPasteEmpty(int); +pcb_bool IsDataEmpty(DataTypePtr); +pcb_bool IsPasteEmpty(int); void CountHoles(int *, int *, const BoxType *); BoxTypePtr GetDataBoundingBox(DataTypePtr); void CenterDisplay(Coord, Coord); Index: trunk/src/misc_util.c =================================================================== --- trunk/src/misc_util.c (revision 3382) +++ trunk/src/misc_util.c (revision 3383) @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -59,19 +58,19 @@ } /* Get Value returns a numeric value passed from the string and sets the - * bool variable absolute to false if it leads with a +/- character + * pcb_bool variable absolute to false if it leads with a +/- character */ -double GetValue(const char *val, const char *units, bool * absolute, bool *success) +double GetValue(const char *val, const char *units, pcb_bool * absolute, pcb_bool *success) { return GetValueEx(val, units, absolute, NULL, "cmil", success); } -double GetValueEx(const char *val, const char *units, bool * absolute, UnitList extra_units, const char *default_unit, bool *success) +double GetValueEx(const char *val, const char *units, pcb_bool * absolute, UnitList extra_units, const char *default_unit, pcb_bool *success) { double value; int n = -1; - bool scaled = 0; - bool dummy; + pcb_bool scaled = 0; + pcb_bool dummy; /* Allow NULL to be passed for absolute */ if (absolute == NULL) @@ -81,15 +80,15 @@ * value to the current one */ if (*val == '=') { - *absolute = true; + *absolute = pcb_true; sscanf(val + 1, "%lf%n", &value, &n); n++; } else { if (isdigit((int) *val)) - *absolute = true; + *absolute = pcb_true; else - *absolute = false; + *absolute = pcb_false; sscanf(val, "%lf%n", &value, &n); } if (n <= 0) Index: trunk/src/misc_util.h =================================================================== --- trunk/src/misc_util.h (revision 3382) +++ trunk/src/misc_util.h (revision 3383) @@ -29,6 +29,8 @@ #ifndef PCB_MISC_UTIL_H #define PCB_MISC_UTIL_H +#include "pcb_bool.h" + double Distance(double x1, double y1, double x2, double y2); double Distance2(double x1, double y1, double x2, double y2); /* distance square */ @@ -40,8 +42,8 @@ enum unitflags flags; } UnitList[]; -double GetValue(const char *, const char *, bool *, bool *success); -double GetValueEx(const char *, const char *, bool *, UnitList, const char *, bool *success); +double GetValue(const char *, const char *, pcb_bool *, pcb_bool *success); +double GetValueEx(const char *, const char *, pcb_bool *, UnitList, const char *, pcb_bool *success); char *Concat(const char *, ...); /* end with NULL */ int mem_any_set(unsigned char *ptr, int bytes); Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 3382) +++ trunk/src/move.c (revision 3383) @@ -72,7 +72,7 @@ */ static Coord DeltaX, DeltaY; /* used by local routines as offset */ static LayerTypePtr Dest; -static bool MoreToCome; +static pcb_bool MoreToCome; static ObjectFunctionType MoveFunctions = { MoveLine, MoveText, @@ -188,7 +188,7 @@ */ static void *MoveElement(ElementTypePtr Element) { - bool didDraw = false; + pcb_bool didDraw = pcb_false; pcb_trace("MoveElement() enter %p {\n", (void *)Element); @@ -198,7 +198,7 @@ MoveElementLowLevel(PCB->Data, Element, DeltaX, DeltaY); DrawElementName(Element); DrawElementPackage(Element); - didDraw = true; + didDraw = pcb_true; } else { pcb_trace(" ME b2\n"); @@ -209,7 +209,7 @@ if (PCB->PinOn) { pcb_trace(" ME b3\n"); DrawElementPinsAndPads(Element); - didDraw = true; + didDraw = pcb_true; } if (didDraw) Draw(); @@ -729,7 +729,7 @@ * moves the object identified by its data pointers and the type * to a new layer without changing it's position */ -void *MoveObjectToLayer(int Type, void *Ptr1, void *Ptr2, void *Ptr3, LayerTypePtr Target, bool enmasse) +void *MoveObjectToLayer(int Type, void *Ptr1, void *Ptr2, void *Ptr3, LayerTypePtr Target, pcb_bool enmasse) { void *result; @@ -745,15 +745,15 @@ * moves the selected objects to a new layer without changing their * positions */ -bool MoveSelectedObjectsToLayer(LayerTypePtr Target) +pcb_bool MoveSelectedObjectsToLayer(LayerTypePtr Target) { - bool changed; + pcb_bool changed; /* setup global identifiers */ Dest = Target; - MoreToCome = true; - changed = SelectedOperation(&MoveToLayerFunctions, true, PCB_TYPEMASK_ALL); - /* passing true to above operation causes Undoserial to auto-increment */ + MoreToCome = pcb_true; + changed = SelectedOperation(&MoveToLayerFunctions, pcb_true, PCB_TYPEMASK_ALL); + /* passing pcb_true to above operation causes Undoserial to auto-increment */ return (changed); } Index: trunk/src/move.h =================================================================== --- trunk/src/move.h (revision 3382) +++ trunk/src/move.h (revision 3383) @@ -94,9 +94,9 @@ void MovePolygonLowLevel(PolygonTypePtr, Coord, Coord); void MoveElementLowLevel(DataTypePtr, ElementTypePtr, Coord, Coord); void *MoveObject(int, void *, void *, void *, Coord, Coord); -void *MoveObjectToLayer(int, void *, void *, void *, LayerTypePtr, bool); +void *MoveObjectToLayer(int, void *, void *, void *, LayerTypePtr, pcb_bool); void *MoveObjectAndRubberband(int, void *, void *, void *, Coord, Coord); -bool MoveSelectedObjectsToLayer(LayerTypePtr); +pcb_bool MoveSelectedObjectsToLayer(LayerTypePtr); /* index is 0..MAX_LAYER-1. If old_index is -1, a new layer is inserted at that index. If new_index is -1, the specified layer is Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 3382) +++ trunk/src/netlist.c (revision 3383) @@ -108,7 +108,7 @@ static int pin_name_to_xy(LibraryEntryType * pin, int *x, int *y) { ConnectionType conn; - if (!SeekPad(pin, &conn, false)) + if (!SeekPad(pin, &conn, pcb_false)) return 1; switch (conn.type) { case PCB_TYPE_PIN: Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 3382) +++ trunk/src/object_act.c (revision 3383) @@ -302,7 +302,7 @@ IncrementUndoSerialNumber(); Redraw(); - SetChangedFlag(true); + SetChangedFlag(pcb_true); return 0; } @@ -378,7 +378,7 @@ const char *y_str = ACTION_ARG(1); const char *units = ACTION_ARG(2); Coord nx, ny; - bool absolute1, absolute2; + pcb_bool absolute1, absolute2; void *ptr1, *ptr2, *ptr3; int type; @@ -400,7 +400,7 @@ if (type == PCB_TYPE_ELEMENT) LookupRatLines(type, ptr1, ptr2, ptr3); MoveObjectAndRubberband(type, ptr1, ptr2, ptr3, nx, ny); - SetChangedFlag(true); + SetChangedFlag(pcb_true); return 0; } @@ -430,8 +430,8 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, MOVETOLAYER_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (MoveObjectToLayer(type, ptr1, ptr2, ptr3, CURRENT, false)) - SetChangedFlag(true); + if (MoveObjectToLayer(type, ptr1, ptr2, ptr3, CURRENT, pcb_false)) + SetChangedFlag(pcb_true); break; } @@ -438,7 +438,7 @@ case F_SelectedObjects: case F_Selected: if (MoveSelectedObjectsToLayer(CURRENT)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; } } @@ -586,7 +586,7 @@ /* Place components onto center of board. */ if (CopyPastebufferToLayout(nx, ny)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); } else if (e && strcmp(DESCRIPTION_NAME(e), footprint) != 0) { @@ -625,7 +625,7 @@ RemoveElement(e); if (CopyPastebufferToLayout(mx, my)) - SetChangedFlag(true); + SetChangedFlag(pcb_true); } /* Now reload footprint */ @@ -733,7 +733,7 @@ static int ActionRipUp(int argc, const char **argv, Coord x, Coord y) { const char *function = ACTION_ARG(0); - bool changed = false; + pcb_bool changed = pcb_false; if (function) { switch (funchash_get(function, NULL)) { @@ -742,7 +742,7 @@ { if (TEST_FLAG(PCB_FLAG_AUTO, line) && !TEST_FLAG(PCB_FLAG_LOCK, line)) { RemoveObject(PCB_TYPE_LINE, layer, line, line); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -750,7 +750,7 @@ { if (TEST_FLAG(PCB_FLAG_AUTO, arc) && !TEST_FLAG(PCB_FLAG_LOCK, arc)) { RemoveObject(PCB_TYPE_ARC, layer, arc, arc); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -758,7 +758,7 @@ { if (TEST_FLAG(PCB_FLAG_AUTO, via) && !TEST_FLAG(PCB_FLAG_LOCK, via)) { RemoveObject(PCB_TYPE_VIA, via, via, via); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -765,7 +765,7 @@ if (changed) { IncrementUndoSerialNumber(); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } break; case F_Selected: @@ -774,7 +774,7 @@ if (TEST_FLAGS(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, line) && !TEST_FLAG(PCB_FLAG_LOCK, line)) { RemoveObject(PCB_TYPE_LINE, layer, line, line); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -784,13 +784,13 @@ if (TEST_FLAGS(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, via) && !TEST_FLAG(PCB_FLAG_LOCK, via)) { RemoveObject(PCB_TYPE_VIA, via, via, via); - changed = true; + changed = pcb_true; } } END_LOOP; if (changed) { IncrementUndoSerialNumber(); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } break; case F_Element: @@ -811,7 +811,7 @@ RestoreUndoSerialNumber(); CopyPastebufferToLayout(0, 0); SetBufferNumber(Note.Buffer); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } } break; @@ -839,7 +839,7 @@ const char *function = ACTION_ARG(0); const char *delta = ACTION_ARG(1); const char *units = ACTION_ARG(2); - bool absolute; + pcb_bool absolute; Coord value; int flags; @@ -913,7 +913,7 @@ const char *function = ACTION_ARG(0); const char *delta = ACTION_ARG(1); const char *units = ACTION_ARG(2); - bool absolute; + pcb_bool absolute; Coord value; int flags; Index: trunk/src/pcb_bool.h =================================================================== --- trunk/src/pcb_bool.h (nonexistent) +++ trunk/src/pcb_bool.h (revision 3383) @@ -0,0 +1,31 @@ +/* + * COPYRIGHT + * + * pcb-rnd, interactive printed circuit board design + * Copyright (C) 2016 Tibor 'Igor2' Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#ifndef PCB_BOOL_H +#define PCB_BOOL_H +/* Because stdbool is not c89 */ +typedef int pcb_bool; +typedef enum pcb_bool_e { + pcb_false = 0, + pcb_true = 1 +} pcb_bool_t; +#endif Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 3382) +++ trunk/src/plug_io.c (revision 3383) @@ -260,14 +260,14 @@ * parse the file with enabled 'PCB mode' (see parser) * if successful, update some other stuff * - * If revert is true, we pass "revert" as a parameter + * If revert is pcb_true, we pass "revert" as a parameter * to the HID's PCBChanged action. */ -static int real_load_pcb(const char *Filename, const char *fmt, bool revert, bool require_font, int how) +static int real_load_pcb(const char *Filename, const char *fmt, pcb_bool revert, pcb_bool require_font, int how) { const char *unit_suffix; char *new_filename; - PCBTypePtr newPCB = CreateNewPCB_(false); + PCBTypePtr newPCB = CreateNewPCB_(pcb_false); PCBTypePtr oldPCB; conf_role_t settings_dest; #ifdef DEBUG @@ -283,7 +283,7 @@ PCB = newPCB; /* mark the default font invalid to know if the file has one */ - newPCB->Font.Valid = false; + newPCB->Font.Valid = pcb_false; switch(how) { case 0: settings_dest = CFR_DESIGN; break; @@ -312,11 +312,11 @@ if (!PCB->Font.Valid) { if (require_font) Message(PCB_MSG_DEFAULT, _("File '%s' has no font information, using default font\n"), new_filename); - PCB->Font.Valid = true; + PCB->Font.Valid = pcb_true; } /* clear 'changed flag' */ - SetChangedFlag(false); + SetChangedFlag(pcb_false); PCB->Filename = new_filename; /* just in case a bad file saved file is loaded */ @@ -356,7 +356,7 @@ PCB = oldPCB; if (PCB == NULL) { /* bozo: we are trying to revert back to a non-existing pcb... create one to avoid a segfault */ - PCB = CreateNewPCB_(false); + PCB = CreateNewPCB_(pcb_false); if (PCB == NULL) { Message(PCB_MSG_DEFAULT, "FATAL: can't create a new empty pcb!"); exit(1); @@ -453,7 +453,7 @@ /* --------------------------------------------------------------------------- * opens a file and check if it exists */ -FILE *CheckAndOpenFile(const char *Filename, bool Confirm, bool AllButton, bool * WasAllButton, bool * WasCancelButton) +FILE *CheckAndOpenFile(const char *Filename, pcb_bool Confirm, pcb_bool AllButton, pcb_bool * WasAllButton, pcb_bool * WasCancelButton) { FILE *fp = NULL; struct stat buffer; @@ -464,9 +464,9 @@ if (!stat(Filename, &buffer) && Confirm) { sprintf(message, _("File '%s' exists, use anyway?"), Filename); if (WasAllButton) - *WasAllButton = false; + *WasAllButton = pcb_false; if (WasCancelButton) - *WasCancelButton = false; + *WasCancelButton = pcb_false; if (AllButton) response = gui->confirm_dialog(message, "Cancel", "Ok", AllButton ? "Sequence OK" : 0); else @@ -475,11 +475,11 @@ switch (response) { case 2: if (WasAllButton) - *WasAllButton = true; + *WasAllButton = pcb_true; break; case 0: if (WasCancelButton) - *WasCancelButton = true; + *WasCancelButton = pcb_true; } } if ((fp = fopen(Filename, "w")) == NULL) @@ -496,7 +496,7 @@ char *fname; FILE *fp; static char *default_file = NULL; - bool result; /* not used */ + pcb_bool result; /* not used */ /* CheckAndOpenFile deals with the case where fname already exists */ fname = gui->fileselect(_("Save Connection Data As ..."), @@ -512,7 +512,7 @@ if (fname && *fname) default_file = pcb_strdup(fname); - fp = CheckAndOpenFile(fname, true, false, &result, NULL); + fp = CheckAndOpenFile(fname, pcb_true, pcb_false, &result, NULL); free(fname); return fp; @@ -527,7 +527,7 @@ if (SWAP_IDENT) pcb_swap_buffers(); - result = WritePipe(Filename, false, fmt); + result = WritePipe(Filename, pcb_false, fmt); if (SWAP_IDENT) pcb_swap_buffers(); return (result); @@ -541,11 +541,11 @@ int retcode; if (gui->notify_save_pcb == NULL) - return WritePipe(file, true, fmt); + return WritePipe(file, pcb_true, fmt); - gui->notify_save_pcb(file, false); - retcode = WritePipe(file, true, fmt); - gui->notify_save_pcb(file, true); + gui->notify_save_pcb(file, pcb_false); + retcode = WritePipe(file, pcb_true, fmt); + gui->notify_save_pcb(file, pcb_true); return retcode; } @@ -554,9 +554,9 @@ /* --------------------------------------------------------------------------- * Load PCB */ -int LoadPCB(const char *file, const char *fmt, bool require_font, int how) +int LoadPCB(const char *file, const char *fmt, pcb_bool require_font, int how) { - return real_load_pcb(file, fmt, false, require_font, how); + return real_load_pcb(file, fmt, pcb_false, require_font, how); } /* --------------------------------------------------------------------------- @@ -565,7 +565,7 @@ int RevertPCB(void) { #warning TODO: use the format saved with PCB - return real_load_pcb(PCB->Filename, NULL, true, true, true); + return real_load_pcb(PCB->Filename, NULL, pcb_true, pcb_true, pcb_true); } /* --------------------------------------------------------------------------- @@ -613,19 +613,19 @@ * front-end for 'SaveInTMP()' * just makes sure that the routine is only called once */ -static bool dont_save_any_more = false; +static pcb_bool dont_save_any_more = pcb_false; void EmergencySave(void) { if (!dont_save_any_more) { SaveInTMP(); - dont_save_any_more = true; + dont_save_any_more = pcb_true; } } void DisableEmergencySave(void) { - dont_save_any_more = true; + dont_save_any_more = pcb_true; } /* ---------------------------------------------------------------------- @@ -775,7 +775,7 @@ * writes to pipe using the command defined by conf_core.rc.save_command * %f are replaced by the passed filename */ -int WritePipe(const char *Filename, bool thePcb, const char *fmt) +int WritePipe(const char *Filename, pcb_bool thePcb, const char *fmt) { FILE *fp; int result; Index: trunk/src/plug_io.h =================================================================== --- trunk/src/plug_io.h (revision 3382) +++ trunk/src/plug_io.h (revision 3383) @@ -94,10 +94,10 @@ /********** common function used to be part of file.[ch] and friends **********/ -FILE *CheckAndOpenFile(const char *, bool, bool, bool *, bool *); +FILE *CheckAndOpenFile(const char *, pcb_bool, pcb_bool, pcb_bool *, pcb_bool *); FILE *OpenConnectionDataFile(void); int SavePCB(const char *, const char *fmt); -int LoadPCB(const char *name, const char *fmt, bool, int how); /* how: 0=normal pcb; 1=default.pcb, 2=misc (do not load settings) */ +int LoadPCB(const char *name, const char *fmt, pcb_bool, int how); /* how: 0=normal pcb; 1=default.pcb, 2=misc (do not load settings) */ void EnableAutosave(void); void Backup(void); void SaveInTMP(void); @@ -110,7 +110,7 @@ void sort_library(LibraryTypePtr lib); void set_some_route_style(); int WritePCBFile(const char *, const char *fmt); -int WritePipe(const char *, bool, const char *fmt); +int WritePipe(const char *, pcb_bool, const char *fmt); #ifndef HAS_ATEXIT void SaveTMPData(void); Index: trunk/src/polyarea.h =================================================================== --- trunk/src/polyarea.h (revision 3382) +++ trunk/src/polyarea.h (revision 3383) @@ -91,7 +91,7 @@ unsigned int Count; double area; rtree_t *tree; - bool is_round; + pcb_bool is_round; Coord cx, cy; Coord radius; struct { Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 3382) +++ trunk/src/polygon.c (revision 3383) @@ -695,7 +695,7 @@ } /* clear np1 from the polygon */ -static int Subtract(POLYAREA * np1, PolygonType * p, bool fnp) +static int Subtract(POLYAREA * np1, PolygonType * p, pcb_bool fnp) { POLYAREA *merged = NULL, *np = np1; int x; @@ -804,7 +804,7 @@ return 0; if (!(np = LinePoly(line, line->Thickness + line->Clearance))) return -1; - return Subtract(np, p, true); + return Subtract(np, p, pcb_true); } static int SubtractArc(ArcType * arc, PolygonType * p) @@ -815,7 +815,7 @@ return 0; if (!(np = ArcPoly(arc, arc->Thickness + arc->Clearance))) return -1; - return Subtract(np, p, true); + return Subtract(np, p, pcb_true); } static int SubtractText(TextType * text, PolygonType * p) @@ -827,7 +827,7 @@ return 0; if (!(np = RoundRect(b->X1 + PCB->Bloat, b->X2 - PCB->Bloat, b->Y1 + PCB->Bloat, b->Y2 - PCB->Bloat, PCB->Bloat))) return -1; - return Subtract(np, p, true); + return Subtract(np, p, pcb_true); } static int SubtractPad(PadType * pad, PolygonType * p) @@ -844,7 +844,7 @@ if (!(np = LinePoly((LineType *) pad, pad->Thickness + pad->Clearance))) return -1; } - return Subtract(np, p, true); + return Subtract(np, p, pcb_true); } struct cpInfo { @@ -852,7 +852,7 @@ DataType *data; LayerType *layer; PolygonType *polygon; - bool solder; + pcb_bool solder; POLYAREA *accumulate; int batch_size; jmp_buf env; @@ -862,7 +862,7 @@ { if (info->accumulate == NULL) return; - Subtract(info->accumulate, polygon, true); + Subtract(info->accumulate, polygon, pcb_true); info->accumulate = NULL; info->batch_size = 0; } @@ -1169,7 +1169,7 @@ return 1; } -static bool inhibit = false; +static pcb_bool inhibit = pcb_false; int InitClip(DataTypePtr Data, LayerTypePtr layer, PolygonType * p) { @@ -1192,17 +1192,17 @@ /* -------------------------------------------------------------------------- * remove redundant polygon points. Any point that lies on the straight * line between the points on either side of it is redundant. - * returns true if any points are removed + * returns pcb_true if any points are removed */ -bool RemoveExcessPolygonPoints(LayerTypePtr Layer, PolygonTypePtr Polygon) +pcb_bool RemoveExcessPolygonPoints(LayerTypePtr Layer, PolygonTypePtr Polygon) { PointTypePtr p; Cardinal n, prev, next; LineType line; - bool changed = false; + pcb_bool changed = pcb_false; if (Undoing()) - return (false); + return (pcb_false); for (n = 0; n < Polygon->PointN; n++) { prev = prev_contour_point(Polygon, n); @@ -1214,7 +1214,7 @@ line.Thickness = 0; if (IsPointOnLine(p->X, p->Y, 0.0, &line)) { RemoveObject(PCB_TYPE_POLYGON_POINT, Layer, Polygon, p); - changed = true; + changed = pcb_true; } } return (changed); @@ -1350,7 +1350,7 @@ r_insert_entry(CURRENT->polygon_tree, (BoxType *) polygon, 0); InitClip(PCB->Data, CURRENT, polygon); DrawPolygon(CURRENT, polygon); - SetChangedFlag(true); + SetChangedFlag(pcb_true); /* reset state of attached line */ Crosshair.AttachedLine.State = STATE_FIRST; @@ -1556,10 +1556,10 @@ PlowsPolygon(Data, type, ptr1, ptr2, subtract_plow); } -bool isects(POLYAREA * a, PolygonTypePtr p, bool fr) +pcb_bool isects(POLYAREA * a, PolygonTypePtr p, pcb_bool fr) { POLYAREA *x; - bool ans; + pcb_bool ans; ans = Touching(a, p->Clipped); /* argument may be register, so we must copy it */ x = a; @@ -1569,7 +1569,7 @@ } -bool IsPointInPolygon(Coord X, Coord Y, Coord r, PolygonTypePtr p) +pcb_bool IsPointInPolygon(Coord X, Coord Y, Coord r, PolygonTypePtr p) { POLYAREA *c; Vector v; @@ -1576,16 +1576,16 @@ v[0] = X; v[1] = Y; if (poly_CheckInside(p->Clipped, v)) - return true; + return pcb_true; if (r < 1) - return false; + return pcb_false; if (!(c = CirclePoly(X, Y, r))) - return false; - return isects(c, p, true); + return pcb_false; + return isects(c, p, pcb_true); } -bool IsPointInPolygonIgnoreHoles(Coord X, Coord Y, PolygonTypePtr p) +pcb_bool IsPointInPolygonIgnoreHoles(Coord X, Coord Y, PolygonTypePtr p) { Vector v; v[0] = X; @@ -1593,12 +1593,12 @@ return poly_InsideContour(p->Clipped->contours, v); } -bool IsRectangleInPolygon(Coord X1, Coord Y1, Coord X2, Coord Y2, PolygonTypePtr p) +pcb_bool IsRectangleInPolygon(Coord X1, Coord Y1, Coord X2, Coord Y2, PolygonTypePtr p) { POLYAREA *s; if (!(s = RectPoly(min(X1, X2), max(X1, X2), min(Y1, Y2), max(Y1, Y2)))) - return false; - return isects(s, p, true); + return pcb_false; + return isects(s, p, pcb_true); } /* NB: This function will free the passed POLYAREA. @@ -1675,16 +1675,16 @@ } /* make a polygon split into multiple parts into multiple polygons */ -bool MorphPolygon(LayerTypePtr layer, PolygonTypePtr poly) +pcb_bool MorphPolygon(LayerTypePtr layer, PolygonTypePtr poly) { POLYAREA *p, *start; - bool many = false; + pcb_bool many = pcb_false; FlagType flags; if (!poly->Clipped || TEST_FLAG(PCB_FLAG_LOCK, poly)) - return false; + return pcb_false; if (poly->Clipped->f == poly->Clipped) - return false; + return pcb_false; ErasePolygon(poly); start = p = poly->Clipped; /* This is ugly. The creation of the new polygons can cause @@ -1701,7 +1701,7 @@ poly->NoHoles = NULL; flags = poly->Flags; RemovePolygon(layer, poly); - inhibit = true; + inhibit = pcb_true; do { VNODE *v; PolygonTypePtr newone; @@ -1709,8 +1709,8 @@ if (p->contours->area > PCB->IsleArea) { newone = CreateNewPolygon(layer, flags); if (!newone) - return false; - many = true; + return pcb_false; + many = pcb_true; v = &p->contours->head; CreateNewPointInPolygon(newone, v->point[0], v->point[1]); for (v = v->next; v != &p->contours->head; v = v->next) @@ -1735,7 +1735,7 @@ } } while (p != start); - inhibit = false; + inhibit = pcb_false; IncrementUndoSerialNumber(); return many; } @@ -1794,7 +1794,7 @@ POLYAREA *pa; PLINE *pline; VNODE *node; - bool outer; + pcb_bool outer; if (Input == NULL) return; @@ -1804,12 +1804,12 @@ Polygon = CreateNewPolygon(Layer, Flags); pline = pa->contours; - outer = true; + outer = pcb_true; do { if (!outer) CreateNewHoleInPolygon(Polygon); - outer = false; + outer = pcb_false; node = &pline->head; do { @@ -1832,5 +1832,5 @@ } while ((pa = pa->f) != Input); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } Index: trunk/src/polygon.h =================================================================== --- trunk/src/polygon.h (revision 3382) +++ trunk/src/polygon.h (revision 3383) @@ -54,7 +54,7 @@ Cardinal prev_contour_point(PolygonTypePtr polygon, Cardinal point); Cardinal next_contour_point(PolygonTypePtr polygon, Cardinal point); Cardinal GetLowestDistancePolygonPoint(PolygonTypePtr, Coord, Coord); -bool RemoveExcessPolygonPoints(LayerTypePtr, PolygonTypePtr); +pcb_bool RemoveExcessPolygonPoints(LayerTypePtr, PolygonTypePtr); void GoToPreviousPoint(void); void ClosePolygon(void); void CopyAttachedPolygonToLayer(void); @@ -76,11 +76,11 @@ void RestoreToPolygon(DataType *, int, void *, void *); void ClearFromPolygon(DataType *, int, void *, void *); -bool IsPointInPolygon(Coord, Coord, Coord, PolygonTypePtr); -bool IsPointInPolygonIgnoreHoles(Coord, Coord, PolygonTypePtr); -bool IsRectangleInPolygon(Coord, Coord, Coord, Coord, PolygonTypePtr); -bool isects(POLYAREA *, PolygonTypePtr, bool); -bool MorphPolygon(LayerTypePtr, PolygonTypePtr); +pcb_bool IsPointInPolygon(Coord, Coord, Coord, PolygonTypePtr); +pcb_bool IsPointInPolygonIgnoreHoles(Coord, Coord, PolygonTypePtr); +pcb_bool IsRectangleInPolygon(Coord, Coord, Coord, Coord, PolygonTypePtr); +pcb_bool isects(POLYAREA *, PolygonTypePtr, pcb_bool); +pcb_bool MorphPolygon(LayerTypePtr, PolygonTypePtr); void NoHolesPolygonDicer(PolygonType * p, const BoxType * clip, void (*emit) (PLINE *, void *), void *user_data); void PolyToPolygonsOnLayer(DataType *, LayerType *, POLYAREA *, FlagType); Index: trunk/src/polygon1.c =================================================================== --- trunk/src/polygon1.c (revision 3382) +++ trunk/src/polygon1.c (revision 3383) @@ -589,7 +589,7 @@ i->s->p->Flags.status = ISECTED; s->p->Flags.status = ISECTED; for (; cnt; cnt--) { - bool done_insert_on_i = false; + pcb_bool done_insert_on_i = pcb_false; new_node = node_add_single_point(i->v, cnt > 1 ? s2 : s1); if (new_node != NULL) { #ifdef DEBUG_INTERSECT @@ -597,7 +597,7 @@ #endif i->node_insert_list = prepend_insert_node_task(i->node_insert_list, i->s, new_node); i->s->intersected = 1; - done_insert_on_i = true; + done_insert_on_i = pcb_true; } new_node = node_add_single_point(s->v, cnt > 1 ? s2 : s1); if (new_node != NULL) { @@ -1015,7 +1015,7 @@ { assert(ppl != NULL && ppl->contours != NULL); if (poly->Flags.status == ISECTED) { - label_contour(poly); /* should never get here when BOOLp is true */ + label_contour(poly); /* should never get here when BOOLp is pcb_true */ } else if (cntr_in_M_POLYAREA(poly, ppl, test)) { if (test) @@ -1024,7 +1024,7 @@ } else { if (test) - return false; + return pcb_false; poly->Flags.status = OUTSIDE; } return FALSE; @@ -1402,7 +1402,7 @@ * if the direction is BACKW, then we return the next vertex * so that prev vertex has the flags for the edge * - * returns true if an edge is found, false otherwise + * returns pcb_true if an edge is found, pcb_false otherwise */ static int jump(VNODE ** cur, DIRECTION * cdir, J_Rule rule) { @@ -2030,7 +2030,7 @@ if (!poly_Valid(b)) return -1; #endif - M_POLYAREA_intersect(&e, a, b, false); + M_POLYAREA_intersect(&e, a, b, pcb_false); if (M_POLYAREA_label(a, b, TRUE)) return TRUE; Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 3382) +++ trunk/src/polygon_act.c (revision 3383) @@ -115,7 +115,7 @@ { const char *function = ACTION_ARG(0); if (function && conf_core.editor.mode == PCB_MODE_POLYGON) { - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); switch (funchash_get(function, NULL)) { /* close open polygon if possible */ case F_Close: @@ -127,7 +127,7 @@ GoToPreviousPoint(); break; } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); } return 0; } Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 3382) +++ trunk/src/rats.c (revision 3383) @@ -53,18 +53,18 @@ /* --------------------------------------------------------------------------- * some forward declarations */ -static bool FindPad(const char *, const char *, ConnectionType *, bool); -static bool ParseConnection(const char *, char *, char *); -static bool DrawShortestRats(NetListTypePtr, +static pcb_bool FindPad(const char *, const char *, ConnectionType *, pcb_bool); +static pcb_bool ParseConnection(const char *, char *, char *); +static pcb_bool DrawShortestRats(NetListTypePtr, void (*)(register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr)); -static bool GatherSubnets(NetListTypePtr, bool, bool); -static bool CheckShorts(LibraryMenuTypePtr); +static pcb_bool GatherSubnets(NetListTypePtr, pcb_bool, pcb_bool); +static pcb_bool CheckShorts(LibraryMenuTypePtr); static void TransferNet(NetListTypePtr, NetTypePtr, NetTypePtr); /* --------------------------------------------------------------------------- * some local identifiers */ -static bool badnet = false; +static pcb_bool badnet = pcb_false; static Cardinal SLayer, CLayer; /* layer group holding solder/component side */ /* --------------------------------------------------------------------------- @@ -74,7 +74,7 @@ * number of characters processed from the string, otherwise * it returns 0 */ -static bool ParseConnection(const char *InString, char *ElementName, char *PinNum) +static pcb_bool ParseConnection(const char *InString, char *ElementName, char *PinNum) { int i, j; @@ -87,12 +87,12 @@ for (i = 0, j++; InString[j] != '\0'; i++, j++) PinNum[i] = InString[j]; PinNum[i] = '\0'; - return (false); + return (pcb_false); } else { ElementName[j] = '\0'; Message(PCB_MSG_DEFAULT, _("Bad net-list format encountered near: \"%s\"\n"), ElementName); - return (true); + return (pcb_true); } } @@ -99,7 +99,7 @@ /* --------------------------------------------------------------------------- * Find a particular pad from an element name and pin number */ -static bool FindPad(const char *ElementName, const char *PinNum, ConnectionType * conn, bool Same) +static pcb_bool FindPad(const char *ElementName, const char *PinNum, ConnectionType * conn, pcb_bool Same) { ElementTypePtr element; gdl_iterator_t it; @@ -107,7 +107,7 @@ PinType *pin; if ((element = SearchElementByName(PCB->Data, ElementName)) == NULL) - return false; + return pcb_false; padlist_foreach(&element->Pad, &it, pad) { if (NSTRCMP(PinNum, pad->Number) == 0 && (!Same || !TEST_FLAG(PCB_FLAG_DRC, pad))) { @@ -124,7 +124,7 @@ conn->X = pad->Point1.X; conn->Y = pad->Point1.Y; } - return true; + return pcb_true; } } @@ -136,18 +136,18 @@ conn->group = SLayer; /* any layer will do */ conn->X = pin->X; conn->Y = pin->Y; - return true; + return pcb_true; } } - return false; + return pcb_false; } /*-------------------------------------------------------------------------- * parse a netlist menu entry and locate the corresponding pad - * returns true if found, and fills in Connection information + * returns pcb_true if found, and fills in Connection information */ -bool SeekPad(LibraryEntryType * entry, ConnectionType * conn, bool Same) +pcb_bool SeekPad(LibraryEntryType * entry, ConnectionType * conn, pcb_bool Same) { int j; char ElementName[256]; @@ -154,17 +154,17 @@ char PinNum[256]; if (ParseConnection(entry->ListEntry, ElementName, PinNum)) - return (false); + return (pcb_false); for (j = 0; PinNum[j] != '\0'; j++); if (j == 0) { Message(PCB_MSG_DEFAULT, _("Error! Netlist file is missing pin!\n" "white space after \"%s-\"\n"), ElementName); - badnet = true; + badnet = pcb_true; } else { if (FindPad(ElementName, PinNum, conn, Same)) - return (true); + return (pcb_true); if (Same) - return (false); + return (pcb_false); if (PinNum[j - 1] < '0' || PinNum[j - 1] > '9') { Message(PCB_MSG_DEFAULT, "WARNING! Pin number ending with '%c'" " encountered in netlist file\n" "Probably a bad netlist file format\n", PinNum[j - 1]); @@ -171,11 +171,11 @@ } } Message(PCB_MSG_DEFAULT, _("Can't find %s pin %s called for in netlist.\n"), ElementName, PinNum); - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- - * Read the library-netlist build a true Netlist structure + * Read the library-netlist build a pcb_true Netlist structure */ NetListTypePtr ProcNetlist(LibraryTypePtr net_menu) @@ -189,7 +189,7 @@ return (NULL); FreeNetListMemory(Wantlist); free(Wantlist); - badnet = false; + badnet = pcb_false; /* find layer groups of the component side and solder side */ SLayer = GetLayerGroupNumberByNumber(solder_silk_layer); @@ -212,7 +212,7 @@ MENU_LOOP(net_menu); { if (menu->Name[0] == '*' || menu->flag == 0) { - badnet = true; + badnet = pcb_true; continue; } net = GetNetMemory(Wantlist); @@ -225,7 +225,7 @@ net->Style = NULL; ENTRY_LOOP(menu); { - if (SeekPad(entry, &LastPoint, false)) { + if (SeekPad(entry, &LastPoint, pcb_false)) { if (TEST_FLAG(PCB_FLAG_DRC, (PinTypePtr) LastPoint.ptr2)) Message(PCB_MSG_DEFAULT, _ ("Error! Element %s pin %s appears multiple times in the netlist file.\n"), @@ -246,9 +246,9 @@ } } else - badnet = true; + badnet = pcb_true; /* check for more pins with the same number */ - for (; SeekPad(entry, &LastPoint, true);) { + for (; SeekPad(entry, &LastPoint, pcb_true);) { connection = GetConnectionMemory(net); *connection = LastPoint; /* indicate expect net */ @@ -303,9 +303,9 @@ memset(&Netl->Net[Netl->NetN], 0, sizeof(NetType)); } -static bool CheckShorts(LibraryMenuTypePtr theNet) +static pcb_bool CheckShorts(LibraryMenuTypePtr theNet) { - bool newone, warn = false; + pcb_bool newone, warn = pcb_false; PointerListTypePtr generic = (PointerListTypePtr) calloc(1, sizeof(PointerListType)); /* the first connection was starting point so * the menu is always non-null @@ -318,7 +318,7 @@ ElementType *e = pin->Element; /* TODO: should be: !TEST_FLAG(PCB_FLAG_NONETLIST, (ElementType *)pin->Element)*/ if ((TEST_FLAG(PCB_FLAG_DRC, pin)) && (!(e->Flags.f & PCB_FLAG_NONETLIST))) { - warn = true; + warn = pcb_true; if (!pin->Spare) { Message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to %s pin %s\n"), &theNet->Name[2], UNKNOWN(NAMEONPCB_NAME(element)), UNKNOWN(pin->Number)); @@ -325,11 +325,11 @@ stub_rat_found_short(pin, NULL, &theNet->Name[2]); continue; } - newone = true; + newone = pcb_true; POINTER_LOOP(generic); { if (*ptr == pin->Spare) { - newone = false; + newone = pcb_false; break; } } @@ -349,7 +349,7 @@ ElementType *e = pad->Element; /* TODO: should be: !TEST_FLAG(PCB_FLAG_NONETLIST, (ElementType *)pad->Element)*/ if ((TEST_FLAG(PCB_FLAG_DRC, pad)) && (!(e->Flags.f & PCB_FLAG_NONETLIST)) && (!(e->Name->Flags.f & PCB_FLAG_NONETLIST))) { - warn = true; + warn = pcb_true; if (!pad->Spare) { Message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to %s pad %s\n"), &theNet->Name[2], UNKNOWN(NAMEONPCB_NAME(element)), UNKNOWN(pad->Number)); @@ -356,11 +356,11 @@ stub_rat_found_short(NULL, pad, &theNet->Name[2]); continue; } - newone = true; + newone = pcb_true; POINTER_LOOP(generic); { if (*ptr == pad->Spare) { - newone = false; + newone = pcb_false; break; } } @@ -387,17 +387,17 @@ * initially the netlist has each connection in its own individual net * afterwards there can be many fewer nets with multiple connections each */ -static bool GatherSubnets(NetListTypePtr Netl, bool NoWarn, bool AndRats) +static pcb_bool GatherSubnets(NetListTypePtr Netl, pcb_bool NoWarn, pcb_bool AndRats) { NetTypePtr a, b; ConnectionTypePtr conn; Cardinal m, n; - bool Warned = false; + pcb_bool Warned = pcb_false; for (m = 0; Netl->NetN > 0 && m < Netl->NetN; m++) { a = &Netl->Net[m]; - ResetConnections(false); - RatFindHook(a->Connection[0].type, a->Connection[0].ptr1, a->Connection[0].ptr2, a->Connection[0].ptr2, false, AndRats); + ResetConnections(pcb_false); + RatFindHook(a->Connection[0].type, a->Connection[0].ptr1, a->Connection[0].ptr2, a->Connection[0].ptr2, pcb_false, AndRats); /* now anybody connected to the first point has PCB_FLAG_DRC set */ /* so move those to this subnet */ CLEAR_FLAG(PCB_FLAG_DRC, (PinTypePtr) a->Connection[0].ptr2); @@ -470,7 +470,7 @@ if (!NoWarn) Warned |= CheckShorts(a->Connection[0].menu); } - ResetConnections(false); + ResetConnections(pcb_false); return (Warned); } @@ -484,7 +484,7 @@ * copper-connected subset of the net. */ -static bool +static pcb_bool DrawShortestRats(NetListTypePtr Netl, void (*funcp) (register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr)) { @@ -492,8 +492,8 @@ register float distance, temp; register ConnectionTypePtr conn1, conn2, firstpoint, secondpoint; PolygonTypePtr polygon; - bool changed = false; - bool havepoints; + pcb_bool changed = pcb_false; + pcb_bool havepoints; Cardinal n, m, j; NetTypePtr next, subnet, theSubnet = NULL; @@ -501,7 +501,7 @@ * *something*. */ if (!Netl || Netl->NetN < 1) - return false; + return pcb_false; /* * Everything inside the NetList Netl should be connected together. @@ -530,10 +530,10 @@ * I.e. once per rat we add. */ distance = 0.0; - havepoints = true; /* so we run the loop at least once */ + havepoints = pcb_true; /* so we run the loop at least once */ while (Netl->NetN > 1 && havepoints) { /* This is the top of the "find one rat" logic. */ - havepoints = false; + havepoints = pcb_false; firstpoint = secondpoint = NULL; /* Test Net[0] vs Net[N] for N=1..max. Find the shortest @@ -570,7 +570,7 @@ firstpoint = conn2; secondpoint = conn1; theSubnet = next; - havepoints = true; + havepoints = pcb_true; } else if (conn2->type == PCB_TYPE_POLYGON && (polygon = (PolygonTypePtr) conn2->ptr2) && @@ -580,7 +580,7 @@ firstpoint = conn1; secondpoint = conn2; theSubnet = next; - havepoints = true; + havepoints = pcb_true; } else if ((temp = SQUARE(conn1->X - conn2->X) + SQUARE(conn1->Y - conn2->Y)) < distance || !firstpoint) { distance = temp; @@ -587,7 +587,7 @@ firstpoint = conn1; secondpoint = conn2; theSubnet = next; - havepoints = true; + havepoints = pcb_true; } } } @@ -594,7 +594,7 @@ } /* - * If HAVEPOINTS is true, we've found a pair of points in two + * If HAVEPOINTS is pcb_true, we've found a pair of points in two * separate blobs of the net, and need to connect them together. */ if (havepoints) { @@ -611,7 +611,7 @@ SET_FLAG(PCB_FLAG_VIA, line); AddObjectToCreateUndoList(PCB_TYPE_RATLINE, line, line, line); DrawRat(line); - changed = true; + changed = pcb_true; } } @@ -635,16 +635,16 @@ /* --------------------------------------------------------------------------- * AddAllRats puts the rats nest into the layout from the loaded netlist - * if SelectedOnly is true, it will only draw rats to selected pins and pads + * if SelectedOnly is pcb_true, it will only draw rats to selected pins and pads */ -bool -AddAllRats(bool SelectedOnly, +pcb_bool +AddAllRats(pcb_bool SelectedOnly, void (*funcp) (register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr)) { NetListTypePtr Nets, Wantlist; NetTypePtr lonesome; ConnectionTypePtr onepin; - bool changed, Warned = false; + pcb_bool changed, Warned = pcb_false; /* the netlist library has the text form * ProcNetlist fills in the Netlist @@ -654,9 +654,9 @@ Wantlist = ProcNetlist(&(PCB->NetlistLib[NETLIST_EDITED])); if (!Wantlist) { Message(PCB_MSG_DEFAULT, _("Can't add rat lines because no netlist is loaded.\n")); - return (false); + return (pcb_false); } - changed = false; + changed = pcb_false; /* initialize finding engine */ InitConnectionLookup(); SaveFindFlag(PCB_FLAG_DRC); @@ -685,7 +685,7 @@ } } END_LOOP; - Warned |= GatherSubnets(Nets, SelectedOnly, true); + Warned |= GatherSubnets(Nets, SelectedOnly, pcb_true); if (Nets->NetN > 0) changed |= DrawShortestRats(Nets, funcp); } @@ -695,7 +695,7 @@ FreeConnectionLookupMemory(); RestoreFindFlag(); if (funcp) - return (true); + return (pcb_true); if (Warned || changed) { stub_rat_proc_shorts(); @@ -703,7 +703,7 @@ } if (Warned) - conf_core.temp.rat_warn = true; + conf_core.temp.rat_warn = pcb_true; if (changed) { IncrementUndoSerialNumber(); @@ -710,7 +710,7 @@ if (ratlist_length(&PCB->Data->Rat) > 0) { Message(PCB_MSG_DEFAULT, "%d rat line%s remaining\n", ratlist_length(&PCB->Data->Rat), ratlist_length(&PCB->Data->Rat) > 1 ? "s" : ""); } - return (true); + return (pcb_true); } if (!SelectedOnly && !Warned) { if (!ratlist_length(&PCB->Data->Rat) && !badnet) @@ -719,13 +719,13 @@ Message(PCB_MSG_DEFAULT, _("Nothing more to add, but there are\n" "either rat-lines in the layout, disabled nets\n" "in the net-list, or missing components\n")); } - return (false); + return (pcb_false); } /* XXX: This is copied in large part from AddAllRats above; for * maintainability, AddAllRats probably wants to be tweaked to use this * version of the code so that we don't have duplication. */ -NetListListType CollectSubnets(bool SelectedOnly) +NetListListType CollectSubnets(pcb_bool SelectedOnly) { NetListListType result = { 0, 0, NULL }; NetListTypePtr Nets, Wantlist; @@ -771,7 +771,7 @@ } END_LOOP; /* Note that AndRats is *FALSE* here! */ - GatherSubnets(Nets, SelectedOnly, false); + GatherSubnets(Nets, SelectedOnly, pcb_false); } END_LOOP; FreeConnectionLookupMemory(); Index: trunk/src/rats.h =================================================================== --- trunk/src/rats.h (revision 3382) +++ trunk/src/rats.h (revision 3383) @@ -40,10 +40,10 @@ RatTypePtr AddNet(void); char *ConnectionName(int, void *, void *); -bool AddAllRats(bool, void (*)(register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr)); -bool SeekPad(LibraryEntryTypePtr, ConnectionTypePtr, bool); +pcb_bool AddAllRats(pcb_bool, void (*)(register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr)); +pcb_bool SeekPad(LibraryEntryTypePtr, ConnectionTypePtr, pcb_bool); NetListTypePtr ProcNetlist(LibraryTypePtr); -NetListListType CollectSubnets(bool); +NetListListType CollectSubnets(pcb_bool); #endif Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 3382) +++ trunk/src/rats_act.c (revision 3383) @@ -76,13 +76,13 @@ ClearWarnings(); switch (funchash_get(function, NULL)) { case F_AllRats: - if (AddAllRats(false, NULL)) - SetChangedFlag(true); + if (AddAllRats(pcb_false, NULL)) + SetChangedFlag(pcb_true); break; case F_SelectedRats: case F_Selected: - if (AddAllRats(true, NULL)) - SetChangedFlag(true); + if (AddAllRats(pcb_true, NULL)) + SetChangedFlag(pcb_true); break; case F_Close: small = SQUARE(MAX_COORD); @@ -148,12 +148,12 @@ case F_Find: { gui->get_coords(_("Click on a connection"), &x, &y); - LookupConnection(x, y, true, 1, PCB_FLAG_FOUND); + LookupConnection(x, y, pcb_true, 1, PCB_FLAG_FOUND); break; } case F_ResetLinesAndPolygons: - if (ResetFoundLinesAndPolygons(true)) { + if (ResetFoundLinesAndPolygons(pcb_true)) { IncrementUndoSerialNumber(); Draw(); } @@ -160,7 +160,7 @@ break; case F_ResetPinsViasAndPads: - if (ResetFoundPinsViasAndPads(true)) { + if (ResetFoundPinsViasAndPads(pcb_true)) { IncrementUndoSerialNumber(); Draw(); } @@ -167,7 +167,7 @@ break; case F_Reset: - if (ResetConnections(true)) { + if (ResetConnections(pcb_true)) { IncrementUndoSerialNumber(); Draw(); } @@ -197,13 +197,13 @@ ClearWarnings(); switch (funchash_get(function, NULL)) { case F_AllRats: - if (DeleteRats(false)) - SetChangedFlag(true); + if (DeleteRats(pcb_false)) + SetChangedFlag(pcb_true); break; case F_SelectedRats: case F_Selected: - if (DeleteRats(true)) - SetChangedFlag(true); + if (DeleteRats(pcb_true)) + SetChangedFlag(pcb_true); break; } } Index: trunk/src/remove.c =================================================================== --- trunk/src/remove.c (revision 3382) +++ trunk/src/remove.c (revision 3383) @@ -93,7 +93,7 @@ }; static DataTypePtr DestroyTarget; -static bool Bulk = false; +static pcb_bool Bulk = pcb_false; /* --------------------------------------------------------------------------- * remove PCB @@ -100,7 +100,7 @@ */ void RemovePCB(PCBTypePtr Ptr) { - ClearUndoList(true); + ClearUndoList(pcb_true); FreePCBMemory(Ptr); free(Ptr); } @@ -500,19 +500,19 @@ /* ---------------------------------------------------------------------- * removes all selected and visible objects - * returns true if any objects have been removed + * returns pcb_true if any objects have been removed */ -bool RemoveSelected(void) +pcb_bool RemoveSelected(void) { - Bulk = true; - if (SelectedOperation(&RemoveFunctions, false, PCB_TYPEMASK_ALL)) { + Bulk = pcb_true; + if (SelectedOperation(&RemoveFunctions, pcb_false, PCB_TYPEMASK_ALL)) { IncrementUndoSerialNumber(); Draw(); - Bulk = false; - return (true); + Bulk = pcb_false; + return (pcb_true); } - Bulk = false; - return (false); + Bulk = pcb_false; + return (pcb_false); } /* --------------------------------------------------------------------------- @@ -530,19 +530,19 @@ * can delete all rat lines, or only selected one */ -bool DeleteRats(bool selected) +pcb_bool DeleteRats(pcb_bool selected) { - bool changed = false; - Bulk = true; + pcb_bool changed = pcb_false; + Bulk = pcb_true; RAT_LOOP(PCB->Data); { if ((!selected) || TEST_FLAG(PCB_FLAG_SELECTED, line)) { - changed = true; + changed = pcb_true; RemoveRat(line); } } END_LOOP; - Bulk = false; + Bulk = pcb_false; if (changed) { Draw(); IncrementUndoSerialNumber(); Index: trunk/src/remove.h =================================================================== --- trunk/src/remove.h (revision 3382) +++ trunk/src/remove.h (revision 3383) @@ -45,8 +45,8 @@ void *RemoveElement(ElementTypePtr); void ClearRemoveList(void); void RemovePCB(PCBTypePtr); -bool RemoveSelected(void); -bool DeleteRats(bool); +pcb_bool RemoveSelected(void); +pcb_bool DeleteRats(pcb_bool); void *RemoveObject(int, void *, void *, void *); void *DestroyObject(DataTypePtr, int, void *, void *, void *); Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 3382) +++ trunk/src/remove_act.c (revision 3383) @@ -50,7 +50,7 @@ Note.Y = Crosshair.Y; if (id == -1) { /* no arg */ - if (RemoveSelected() == false) + if (RemoveSelected() == pcb_false) id = F_Object; } @@ -65,12 +65,12 @@ RemoveSelected(); break; case F_AllRats: - if (DeleteRats(false)) - SetChangedFlag(true); + if (DeleteRats(pcb_false)) + SetChangedFlag(pcb_true); break; case F_SelectedRats: - if (DeleteRats(true)) - SetChangedFlag(true); + if (DeleteRats(pcb_true)) + SetChangedFlag(pcb_true); break; } @@ -90,7 +90,7 @@ static int ActionRemoveSelected(int argc, const char **argv, Coord x, Coord y) { if (RemoveSelected()) - SetChangedFlag(true); + SetChangedFlag(pcb_true); return 0; } Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 3382) +++ trunk/src/rotate.c (revision 3383) @@ -325,7 +325,7 @@ { RubberbandTypePtr ptr; void *ptr2; - bool changed = false; + pcb_bool changed = pcb_false; /* setup default global identifiers */ Number = Steps; @@ -335,7 +335,7 @@ /* move all the rubberband lines... and reset the counter */ ptr = Crosshair.AttachedObject.Rubberband; while (Crosshair.AttachedObject.RubberbandN) { - changed = true; + changed = pcb_true; CLEAR_FLAG(PCB_FLAG_RUBBEREND, ptr->Line); AddObjectToRotateUndoList(PCB_TYPE_LINE_POINT, ptr->Layer, ptr->Line, ptr->MovedPoint, CenterX, CenterY, Steps); EraseLine(ptr->Line); @@ -384,6 +384,6 @@ if (type == PCB_TYPE_ELEMENT) LookupRatLines(type, ptr1, ptr2, ptr3); RotateObject(type, ptr1, ptr2, ptr3, X, Y, Steps); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } } Index: trunk/src/rtree.c =================================================================== --- trunk/src/rtree.c (revision 3382) +++ trunk/src/rtree.c (revision 3383) @@ -70,7 +70,7 @@ struct rtree_node *parent; /* parent of this node, NULL = root */ struct { unsigned is_leaf:1; /* this is a leaf node */ - unsigned manage:31; /* true==should free 'rect.bptr' if node is destroyed */ + unsigned manage:31; /* pcb_true==should free 'rect.bptr' if node is destroyed */ } flags; union { struct rtree_node *kids[M_SIZE + 1]; /* when not leaf */ @@ -84,7 +84,7 @@ { int i, flag = 1; int kind = -1; - bool last = false; + pcb_bool last = pcb_false; if (node == NULL) return 1; @@ -91,7 +91,7 @@ for (i = 0; i < M_SIZE; i++) { if (node->flags.is_leaf) { if (!node->u.rects[i].bptr) { - last = true; + last = pcb_true; continue; } /* check that once one entry is empty, all the rest are too */ @@ -123,7 +123,7 @@ } else { if (!node->u.kids[i]) { - last = true; + last = pcb_true; continue; } /* make sure all children are the same type */ @@ -166,7 +166,7 @@ } /* check the whole tree from this node down for consistency */ -static bool __r_tree_is_good(struct rtree_node *node) +static pcb_bool __r_tree_is_good(struct rtree_node *node) { int i; @@ -333,7 +333,7 @@ /* create an r-tree from an unsorted list of boxes. * the r-tree will keep pointers into * it, so don't free the box list until you've called r_destroy_tree. - * if you set 'manage' to true, r_destroy_tree will free your boxlist. + * if you set 'manage' to pcb_true, r_destroy_tree will free your boxlist. */ rtree_t *r_create_tree(const BoxType * boxlist[], int N, int manage) { @@ -570,7 +570,7 @@ { float total_a, total_b; float a_X, a_Y, b_X, b_Y; - bool belong[M_SIZE + 1]; + pcb_bool belong[M_SIZE + 1]; struct centroid center[M_SIZE + 1]; int clust_a, clust_b, tries; int a_manage = 0, b_manage = 0; @@ -611,19 +611,19 @@ dist1 = SQUARE(a_X - center[i].x) + SQUARE(a_Y - center[i].y); dist2 = SQUARE(b_X - center[i].x) + SQUARE(b_Y - center[i].y); if (dist1 * (clust_a + M_SIZE / 2) < dist2 * (clust_b + M_SIZE / 2)) { - belong[i] = true; + belong[i] = pcb_true; clust_a++; } else { - belong[i] = false; + belong[i] = pcb_false; clust_b++; } } /* kludge to fix degenerate cases */ if (clust_a == M_SIZE + 1) - belong[M_SIZE / 2] = false; + belong[M_SIZE / 2] = pcb_false; else if (clust_b == M_SIZE + 1) - belong[M_SIZE / 2] = true; + belong[M_SIZE / 2] = pcb_true; /* compute new center of gravity of clusters */ total_a = total_b = 0; a_X = a_Y = b_X = b_Y = 0; @@ -770,7 +770,7 @@ return score; } -static void __r_insert_node(struct rtree_node *node, const BoxType * query, int manage, bool force) +static void __r_insert_node(struct rtree_node *node, const BoxType * query, int manage, pcb_bool force) { #ifdef SLOW_ASSERTS @@ -839,7 +839,7 @@ if (!node->u.kids[i]) break; if (contained(node->u.kids[i], query)) { - __r_insert_node(node->u.kids[i], query, manage, false); + __r_insert_node(node->u.kids[i], query, manage, pcb_false); sort_node(node); return; } @@ -850,7 +850,7 @@ struct rtree_node *new_node; new_node = (struct rtree_node *) calloc(1, sizeof(*new_node)); new_node->parent = node; - new_node->flags.is_leaf = true; + new_node->flags.is_leaf = pcb_true; node->u.kids[i] = new_node; new_node->u.rects[0].bptr = query; new_node->u.rects[0].bounds = *query; @@ -873,7 +873,7 @@ best_node = node->u.kids[i]; } } - __r_insert_node(best_node, query, manage, true); + __r_insert_node(best_node, query, manage, pcb_true); sort_node(node); return; } @@ -892,13 +892,13 @@ rtree->size++; } -bool __r_delete(struct rtree_node *node, const BoxType * query) +pcb_bool __r_delete(struct rtree_node *node, const BoxType * query) { int i, flag, mask, a; /* the tree might be inconsistent during delete */ if (query->X1 < node->box.X1 || query->Y1 < node->box.Y1 || query->X2 > node->box.X2 || query->Y2 > node->box.Y2) - return false; + return pcb_false; if (!node->flags.is_leaf) { for (i = 0; i < M_SIZE; i++) { /* if this is us being removed, free and copy over */ @@ -917,7 +917,7 @@ /* changing type of node, be sure it's all zero */ for (i = 1; i < M_SIZE + 1; i++) node->u.rects[i].bptr = NULL; - return true; + return pcb_true; } return (__r_delete(node->parent, &node->box)); } @@ -927,16 +927,16 @@ adjust_bounds(node); node = node->parent; } - return true; + return pcb_true; } if (node->u.kids[i]) { if (__r_delete(node->u.kids[i], query)) - return true; + return pcb_true; } else break; } - return false; + return pcb_false; } /* leaf node here */ mask = 0; @@ -954,7 +954,7 @@ a <<= 1; } if (!node->u.rects[i].bptr) - return false; /* not at this leaf */ + return pcb_false; /* not at this leaf */ if (node->flags.manage & a) { free((void *) node->u.rects[i].bptr); node->u.rects[i].bptr = NULL; @@ -972,7 +972,7 @@ if (!node->u.rects[0].bptr) { if (node->parent) __r_delete(node->parent, &node->box); - return true; + return pcb_true; } else /* propagate boundary adjustment upward */ @@ -980,12 +980,12 @@ adjust_bounds(node); node = node->parent; } - return true; + return pcb_true; } -bool r_delete_entry(rtree_t * rtree, const BoxType * box) +pcb_bool r_delete_entry(rtree_t * rtree, const BoxType * box) { - bool r; + pcb_bool r; assert(box); assert(rtree); Index: trunk/src/rtree.h =================================================================== --- trunk/src/rtree.h (revision 3382) +++ trunk/src/rtree.h (revision 3383) @@ -45,7 +45,7 @@ R_DIR_CANCEL /* cancel the search and return immediately */ } r_dir_t; -/* create an rtree from the list of boxes. if 'manage' is true, then +/* create an rtree from the list of boxes. if 'manage' is pcb_true, then * the tree will take ownership of 'boxlist' and free it when the tree * is destroyed. */ rtree_t *r_create_tree(const BoxType * boxlist[], int N, int manage); @@ -52,18 +52,18 @@ /* destroy an rtree */ void r_destroy_tree(rtree_t ** rtree); -bool r_delete_entry(rtree_t * rtree, const BoxType * which); +pcb_bool r_delete_entry(rtree_t * rtree, const BoxType * which); void r_insert_entry(rtree_t * rtree, const BoxType * which, int manage); /* generic search routine */ -/* region_in_search should return true if "what you're looking for" is +/* region_in_search should return pcb_true if "what you're looking for" is * within the specified region; regions, like rectangles, are closed on * top and left and open on bottom and right. - * rectangle_in_region should return true if the given rectangle is + * rectangle_in_region should return pcb_true if the given rectangle is * "what you're looking for". * The search will find all rectangles matching the criteria given * by region_in_search and rectangle_in_region and return a count of - * how many things rectangle_in_region returned true for. closure is + * how many things rectangle_in_region returned pcb_true for. closure is * used to abort the search if desired from within rectangel_in_region * Look at the implementation of r_region_is_empty for how to * abort the search if that is the desired behavior. Index: trunk/src/rubberband.c =================================================================== --- trunk/src/rubberband.c (revision 3382) +++ trunk/src/rubberband.c (revision 3383) @@ -47,7 +47,7 @@ */ static void CheckPadForRubberbandConnection(PadTypePtr); static void CheckPinForRubberbandConnection(PinTypePtr); -static void CheckLinePointForRubberbandConnection(LayerTypePtr, LineTypePtr, PointTypePtr, bool); +static void CheckLinePointForRubberbandConnection(LayerTypePtr, LineTypePtr, PointTypePtr, pcb_bool); static void CheckPolygonForRubberbandConnection(LayerTypePtr, PolygonTypePtr); static void CheckLinePointForRat(LayerTypePtr, PointTypePtr); static r_dir_t rubber_callback(const BoxType * b, void *cl); @@ -325,7 +325,7 @@ * If one of the endpoints of the line lays * inside the passed line, * the scanned line is added to the 'rubberband' list */ -static void CheckLinePointForRubberbandConnection(LayerTypePtr Layer, LineTypePtr Line, PointTypePtr LinePoint, bool Exact) +static void CheckLinePointForRubberbandConnection(LayerTypePtr Layer, LineTypePtr Line, PointTypePtr LinePoint, pcb_bool Exact) { Cardinal group; struct rubber_info info; @@ -429,8 +429,8 @@ LayerTypePtr layer = (LayerTypePtr) Ptr1; LineTypePtr line = (LineTypePtr) Ptr2; if (GetLayerNumber(PCB->Data, layer) < max_copper_layer) { - CheckLinePointForRubberbandConnection(layer, line, &line->Point1, false); - CheckLinePointForRubberbandConnection(layer, line, &line->Point2, false); + CheckLinePointForRubberbandConnection(layer, line, &line->Point1, pcb_false); + CheckLinePointForRubberbandConnection(layer, line, &line->Point2, pcb_false); } break; } @@ -437,7 +437,7 @@ case PCB_TYPE_LINE_POINT: if (GetLayerNumber(PCB->Data, (LayerTypePtr) Ptr1) < max_copper_layer) - CheckLinePointForRubberbandConnection((LayerTypePtr) Ptr1, (LineTypePtr) Ptr2, (PointTypePtr) Ptr3, true); + CheckLinePointForRubberbandConnection((LayerTypePtr) Ptr1, (LineTypePtr) Ptr2, (PointTypePtr) Ptr3, pcb_true); break; case PCB_TYPE_VIA: Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 3382) +++ trunk/src/search.c (revision 3383) @@ -56,18 +56,18 @@ * some local prototypes. The first parameter includes PCB_TYPE_LOCKED if we * want to include locked types in the search. */ -static bool SearchLineByLocation(int, LayerTypePtr *, LineTypePtr *, LineTypePtr *); -static bool SearchArcByLocation(int, LayerTypePtr *, ArcTypePtr *, ArcTypePtr *); -static bool SearchRatLineByLocation(int, RatTypePtr *, RatTypePtr *, RatTypePtr *); -static bool SearchTextByLocation(int, LayerTypePtr *, TextTypePtr *, TextTypePtr *); -static bool SearchPolygonByLocation(int, LayerTypePtr *, PolygonTypePtr *, PolygonTypePtr *); -static bool SearchPinByLocation(int, ElementTypePtr *, PinTypePtr *, PinTypePtr *); -static bool SearchPadByLocation(int, ElementTypePtr *, PadTypePtr *, PadTypePtr *, bool); -static bool SearchViaByLocation(int, PinTypePtr *, PinTypePtr *, PinTypePtr *); -static bool SearchElementNameByLocation(int, ElementTypePtr *, TextTypePtr *, TextTypePtr *, bool); -static bool SearchLinePointByLocation(int, LayerTypePtr *, LineTypePtr *, PointTypePtr *); -static bool SearchPointByLocation(int, LayerTypePtr *, PolygonTypePtr *, PointTypePtr *); -static bool SearchElementByLocation(int, ElementTypePtr *, ElementTypePtr *, ElementTypePtr *, bool); +static pcb_bool SearchLineByLocation(int, LayerTypePtr *, LineTypePtr *, LineTypePtr *); +static pcb_bool SearchArcByLocation(int, LayerTypePtr *, ArcTypePtr *, ArcTypePtr *); +static pcb_bool SearchRatLineByLocation(int, RatTypePtr *, RatTypePtr *, RatTypePtr *); +static pcb_bool SearchTextByLocation(int, LayerTypePtr *, TextTypePtr *, TextTypePtr *); +static pcb_bool SearchPolygonByLocation(int, LayerTypePtr *, PolygonTypePtr *, PolygonTypePtr *); +static pcb_bool SearchPinByLocation(int, ElementTypePtr *, PinTypePtr *, PinTypePtr *); +static pcb_bool SearchPadByLocation(int, ElementTypePtr *, PadTypePtr *, PadTypePtr *, pcb_bool); +static pcb_bool SearchViaByLocation(int, PinTypePtr *, PinTypePtr *, PinTypePtr *); +static pcb_bool SearchElementNameByLocation(int, ElementTypePtr *, TextTypePtr *, TextTypePtr *, pcb_bool); +static pcb_bool SearchLinePointByLocation(int, LayerTypePtr *, LineTypePtr *, PointTypePtr *); +static pcb_bool SearchPointByLocation(int, LayerTypePtr *, PolygonTypePtr *, PointTypePtr *); +static pcb_bool SearchElementByLocation(int, ElementTypePtr *, ElementTypePtr *, ElementTypePtr *, pcb_bool); /* --------------------------------------------------------------------------- * searches a via @@ -74,7 +74,7 @@ */ struct ans_info { void **ptr1, **ptr2, **ptr3; - bool BackToo; + pcb_bool BackToo; double area; int locked; /* This will be zero or PCB_FLAG_LOCK */ }; @@ -95,13 +95,13 @@ return R_DIR_CANCEL; /* found, stop searching */ } -static bool SearchViaByLocation(int locked, PinTypePtr * Via, PinTypePtr * Dummy1, PinTypePtr * Dummy2) +static pcb_bool SearchViaByLocation(int locked, PinTypePtr * Via, PinTypePtr * Dummy1, PinTypePtr * Dummy2) { struct ans_info info; /* search only if via-layer is visible */ if (!PCB->ViaOn) - return false; + return pcb_false; info.ptr1 = (void **) Via; info.ptr2 = (void **) Dummy1; @@ -109,8 +109,8 @@ info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (r_search(PCB->Data->via_tree, &SearchBox, NULL, pinorvia_callback, &info, NULL) != R_DIR_NOT_FOUND) - return true; - return false; + return pcb_true; + return pcb_false; } /* --------------------------------------------------------------------------- @@ -117,13 +117,13 @@ * searches a pin * starts with the newest element */ -static bool SearchPinByLocation(int locked, ElementTypePtr * Element, PinTypePtr * Pin, PinTypePtr * Dummy) +static pcb_bool SearchPinByLocation(int locked, ElementTypePtr * Element, PinTypePtr * Pin, PinTypePtr * Dummy) { struct ans_info info; /* search only if pin-layer is visible */ if (!PCB->PinOn) - return false; + return pcb_false; info.ptr1 = (void **) Element; info.ptr2 = (void **) Pin; info.ptr3 = (void **) Dummy; @@ -130,8 +130,8 @@ info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (r_search(PCB->Data->pin_tree, &SearchBox, NULL, pinorvia_callback, &info, NULL) != R_DIR_NOT_FOUND) - return true; - return false; + return pcb_true; + return pcb_false; } static r_dir_t pad_callback(const BoxType * b, void *cl) @@ -157,13 +157,13 @@ * searches a pad * starts with the newest element */ -static bool SearchPadByLocation(int locked, ElementTypePtr * Element, PadTypePtr * Pad, PadTypePtr * Dummy, bool BackToo) +static pcb_bool SearchPadByLocation(int locked, ElementTypePtr * Element, PadTypePtr * Pad, PadTypePtr * Dummy, pcb_bool BackToo) { struct ans_info info; /* search only if pin-layer is visible */ if (!PCB->PinOn) - return (false); + return (pcb_false); info.ptr1 = (void **) Element; info.ptr2 = (void **) Pad; info.ptr3 = (void **) Dummy; @@ -170,8 +170,8 @@ info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; info.BackToo = (BackToo && PCB->InvisibleObjectsOn); if (r_search(PCB->Data->pad_tree, &SearchBox, NULL, pad_callback, &info, NULL) != R_DIR_NOT_FOUND) - return true; - return false; + return pcb_true; + return pcb_false; } /* --------------------------------------------------------------------------- @@ -202,7 +202,7 @@ } -static bool SearchLineByLocation(int locked, LayerTypePtr * Layer, LineTypePtr * Line, LineTypePtr * Dummy) +static pcb_bool SearchLineByLocation(int locked, LayerTypePtr * Layer, LineTypePtr * Line, LineTypePtr * Dummy) { struct line_info info; @@ -212,9 +212,9 @@ *Layer = SearchLayer; if (r_search(SearchLayer->line_tree, &SearchBox, NULL, line_callback, &info, NULL) != R_DIR_NOT_FOUND) - return true; + return pcb_true; - return false; + return pcb_false; } static r_dir_t rat_callback(const BoxType * box, void *cl) @@ -237,7 +237,7 @@ /* --------------------------------------------------------------------------- * searches rat lines if they are visible */ -static bool SearchRatLineByLocation(int locked, RatTypePtr * Line, RatTypePtr * Dummy1, RatTypePtr * Dummy2) +static pcb_bool SearchRatLineByLocation(int locked, RatTypePtr * Line, RatTypePtr * Dummy1, RatTypePtr * Dummy2) { struct ans_info info; @@ -247,8 +247,8 @@ info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (r_search(PCB->Data->rat_tree, &SearchBox, NULL, rat_callback, &info, NULL) != R_DIR_NOT_FOUND) - return true; - return false; + return pcb_true; + return pcb_false; } /* --------------------------------------------------------------------------- @@ -275,7 +275,7 @@ } -static bool SearchArcByLocation(int locked, LayerTypePtr * Layer, ArcTypePtr * Arc, ArcTypePtr * Dummy) +static pcb_bool SearchArcByLocation(int locked, LayerTypePtr * Layer, ArcTypePtr * Arc, ArcTypePtr * Dummy) { struct arc_info info; @@ -285,8 +285,8 @@ *Layer = SearchLayer; if (r_search(SearchLayer->arc_tree, &SearchBox, NULL, arc_callback, &info, NULL) != R_DIR_NOT_FOUND) - return true; - return false; + return pcb_true; + return pcb_false; } static r_dir_t text_callback(const BoxType * box, void *cl) @@ -307,7 +307,7 @@ /* --------------------------------------------------------------------------- * searches text on the SearchLayer */ -static bool SearchTextByLocation(int locked, LayerTypePtr * Layer, TextTypePtr * Text, TextTypePtr * Dummy) +static pcb_bool SearchTextByLocation(int locked, LayerTypePtr * Layer, TextTypePtr * Text, TextTypePtr * Dummy) { struct ans_info info; @@ -317,8 +317,8 @@ info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (r_search(SearchLayer->text_tree, &SearchBox, NULL, text_callback, &info, NULL) != R_DIR_NOT_FOUND) - return true; - return false; + return pcb_true; + return pcb_false; } static r_dir_t polygon_callback(const BoxType * box, void *cl) @@ -340,7 +340,7 @@ /* --------------------------------------------------------------------------- * searches a polygon on the SearchLayer */ -static bool SearchPolygonByLocation(int locked, LayerTypePtr * Layer, PolygonTypePtr * Polygon, PolygonTypePtr * Dummy) +static pcb_bool SearchPolygonByLocation(int locked, LayerTypePtr * Layer, PolygonTypePtr * Polygon, PolygonTypePtr * Dummy) { struct ans_info info; @@ -350,8 +350,8 @@ info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polygon_callback, &info, NULL) != R_DIR_NOT_FOUND) - return true; - return false; + return pcb_true; + return pcb_false; } static r_dir_t linepoint_callback(const BoxType * b, void *cl) @@ -386,7 +386,7 @@ /* --------------------------------------------------------------------------- * searches a line-point on all the search layer */ -static bool SearchLinePointByLocation(int locked, LayerTypePtr * Layer, LineTypePtr * Line, PointTypePtr * Point) +static pcb_bool SearchLinePointByLocation(int locked, LayerTypePtr * Layer, LineTypePtr * Line, PointTypePtr * Point) { struct line_info info; *Layer = SearchLayer; @@ -396,8 +396,8 @@ info.least = MAX_LINE_POINT_DISTANCE + SearchRadius; info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (r_search(SearchLayer->line_tree, &SearchBox, NULL, linepoint_callback, &info, NULL)) - return true; - return false; + return pcb_true; + return pcb_false; } /* --------------------------------------------------------------------------- @@ -404,10 +404,10 @@ * searches a polygon-point on all layers that are switched on * in layerstack order */ -static bool SearchPointByLocation(int locked, LayerTypePtr * Layer, PolygonTypePtr * Polygon, PointTypePtr * Point) +static pcb_bool SearchPointByLocation(int locked, LayerTypePtr * Layer, PolygonTypePtr * Polygon, PointTypePtr * Point) { double d, least; - bool found = false; + pcb_bool found = pcb_false; least = SearchRadius + MAX_POLYGON_POINT_DISTANCE; *Layer = SearchLayer; @@ -420,7 +420,7 @@ least = d; *Polygon = polygon; *Point = point; - found = true; + found = pcb_true; } } END_LOOP; @@ -427,8 +427,8 @@ } END_LOOP; if (found) - return (true); - return (false); + return (pcb_true); + return (pcb_false); } static r_dir_t name_callback(const BoxType * box, void *cl) @@ -458,8 +458,8 @@ * searches the name of an element * the search starts with the last element and goes back to the beginning */ -static bool -SearchElementNameByLocation(int locked, ElementTypePtr * Element, TextTypePtr * Text, TextTypePtr * Dummy, bool BackToo) +static pcb_bool +SearchElementNameByLocation(int locked, ElementTypePtr * Element, TextTypePtr * Text, TextTypePtr * Dummy, pcb_bool BackToo) { struct ans_info info; @@ -472,9 +472,9 @@ info.BackToo = (BackToo && PCB->InvisibleObjectsOn); info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (r_search(PCB->Data->name_tree[NAME_INDEX()], &SearchBox, NULL, name_callback, &info, NULL)) - return true; + return pcb_true; } - return (false); + return (pcb_false); } static r_dir_t element_callback(const BoxType * box, void *cl) @@ -503,8 +503,8 @@ * the search starts with the last element and goes back to the beginning * if more than one element matches, the smallest one is taken */ -static bool -SearchElementByLocation(int locked, ElementTypePtr * Element, ElementTypePtr * Dummy1, ElementTypePtr * Dummy2, bool BackToo) +static pcb_bool +SearchElementByLocation(int locked, ElementTypePtr * Element, ElementTypePtr * Dummy1, ElementTypePtr * Dummy2, pcb_bool BackToo) { struct ans_info info; @@ -517,15 +517,15 @@ info.BackToo = (BackToo && PCB->InvisibleObjectsOn); info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (r_search(PCB->Data->element_tree, &SearchBox, NULL, element_callback, &info, NULL)) - return true; + return pcb_true; } - return false; + return pcb_false; } /* --------------------------------------------------------------------------- * checks if a point is on a pin */ -bool IsPointOnPin(Coord X, Coord Y, Coord Radius, PinTypePtr pin) +pcb_bool IsPointOnPin(Coord X, Coord Y, Coord Radius, PinTypePtr pin) { Coord t = PIN_SIZE(pin) / 2; if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { @@ -536,21 +536,21 @@ b.Y1 = pin->Y - t; b.Y2 = pin->Y + t; if (IsPointInBox(X, Y, &b, Radius)) - return true; + return pcb_true; } else if (Distance(pin->X, pin->Y, X, Y) <= Radius + t) - return true; - return false; + return pcb_true; + return pcb_false; } /* --------------------------------------------------------------------------- * checks if a rat-line end is on a PV */ -bool IsPointOnLineEnd(Coord X, Coord Y, RatTypePtr Line) +pcb_bool IsPointOnLineEnd(Coord X, Coord Y, RatTypePtr Line) { if (((X == Line->Point1.X) && (Y == Line->Point1.Y)) || ((X == Line->Point2.X) && (Y == Line->Point2.Y))) - return (true); - return (false); + return (pcb_true); + return (pcb_false); } /* --------------------------------------------------------------------------- @@ -585,7 +585,7 @@ * Finally, D1 and D2 are orthogonal, so we can sum them easily * by Pythagorean theorem. */ -bool IsPointOnLine(Coord X, Coord Y, Coord Radius, LineTypePtr Line) +pcb_bool IsPointOnLine(Coord X, Coord Y, Coord Radius, LineTypePtr Line) { double D1, D2, L; @@ -626,7 +626,7 @@ /* --------------------------------------------------------------------------- * checks if a line crosses a rectangle */ -bool IsLineInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, LineTypePtr Line) +pcb_bool IsLineInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, LineTypePtr Line) { LineType line; @@ -633,7 +633,7 @@ /* first, see if point 1 is inside the rectangle */ /* in case the whole line is inside the rectangle */ if (X1 < Line->Point1.X && X2 > Line->Point1.X && Y1 < Line->Point1.Y && Y2 > Line->Point1.Y) - return (true); + return (pcb_true); /* construct a set of dummy lines and check each of them */ line.Thickness = 0; line.Flags = NoFlags(); @@ -643,7 +643,7 @@ line.Point1.X = X1; line.Point2.X = X2; if (LineLineIntersect(&line, Line)) - return (true); + return (pcb_true); /* upper-right to lower-right corner */ line.Point1.X = X2; @@ -650,7 +650,7 @@ line.Point1.Y = Y1; line.Point2.Y = Y2; if (LineLineIntersect(&line, Line)) - return (true); + return (pcb_true); /* lower-right to lower-left corner */ line.Point1.Y = Y2; @@ -657,7 +657,7 @@ line.Point1.X = X1; line.Point2.X = X2; if (LineLineIntersect(&line, Line)) - return (true); + return (pcb_true); /* lower-left to upper-left corner */ line.Point2.X = X1; @@ -664,9 +664,9 @@ line.Point1.Y = Y1; line.Point2.Y = Y2; if (LineLineIntersect(&line, Line)) - return (true); + return (pcb_true); - return (false); + return (pcb_false); } static int /*checks if a point (of null radius) is in a slanted rectangle */ IsPointInQuadrangle(PointType p[4], PointTypePtr l) @@ -690,9 +690,9 @@ y = l->Y - p[2].Y; prod1 = (double) x *dx + (double) y *dy; if (prod0 * prod1 <= 0) - return true; + return pcb_true; } - return false; + return pcb_false; } /* --------------------------------------------------------------------------- @@ -699,7 +699,7 @@ * checks if a line crosses a quadrangle: almost copied from IsLineInRectangle() * Note: actually this quadrangle is a slanted rectangle */ -bool IsLineInQuadrangle(PointType p[4], LineTypePtr Line) +pcb_bool IsLineInQuadrangle(PointType p[4], LineTypePtr Line) { LineType line; @@ -706,9 +706,9 @@ /* first, see if point 1 is inside the rectangle */ /* in case the whole line is inside the rectangle */ if (IsPointInQuadrangle(p, &(Line->Point1))) - return true; + return pcb_true; if (IsPointInQuadrangle(p, &(Line->Point2))) - return true; + return pcb_true; /* construct a set of dummy lines and check each of them */ line.Thickness = 0; line.Flags = NoFlags(); @@ -719,33 +719,33 @@ line.Point2.X = p[1].X; line.Point2.Y = p[1].Y; if (LineLineIntersect(&line, Line)) - return (true); + return (pcb_true); /* upper-right to lower-right corner */ line.Point1.X = p[2].X; line.Point1.Y = p[2].Y; if (LineLineIntersect(&line, Line)) - return (true); + return (pcb_true); /* lower-right to lower-left corner */ line.Point2.X = p[3].X; line.Point2.Y = p[3].Y; if (LineLineIntersect(&line, Line)) - return (true); + return (pcb_true); /* lower-left to upper-left corner */ line.Point1.X = p[0].X; line.Point1.Y = p[0].Y; if (LineLineIntersect(&line, Line)) - return (true); + return (pcb_true); - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * checks if an arc crosses a square */ -bool IsArcInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, ArcTypePtr Arc) +pcb_bool IsArcInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, ArcTypePtr Arc) { LineType line; @@ -758,7 +758,7 @@ line.Point1.X = X1; line.Point2.X = X2; if (LineArcIntersect(&line, Arc)) - return (true); + return (pcb_true); /* upper-right to lower-right corner */ line.Point1.X = line.Point2.X = X2; @@ -765,7 +765,7 @@ line.Point1.Y = Y1; line.Point2.Y = Y2; if (LineArcIntersect(&line, Arc)) - return (true); + return (pcb_true); /* lower-right to lower-left corner */ line.Point1.Y = line.Point2.Y = Y2; @@ -772,7 +772,7 @@ line.Point1.X = X1; line.Point2.X = X2; if (LineArcIntersect(&line, Arc)) - return (true); + return (pcb_true); /* lower-left to upper-left corner */ line.Point1.X = line.Point2.X = X1; @@ -779,9 +779,9 @@ line.Point1.Y = Y1; line.Point2.Y = Y2; if (LineArcIntersect(&line, Arc)) - return (true); + return (pcb_true); - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- @@ -788,7 +788,7 @@ * Check if a circle of Radius with center at (X, Y) intersects a Pad. * Written to enable arbitrary pad directions; for rounded pads, too. */ -bool IsPointInPad(Coord X, Coord Y, Coord Radius, PadTypePtr Pad) +pcb_bool IsPointInPad(Coord X, Coord Y, Coord Radius, PadTypePtr Pad) { double r, Sin, Cos; Coord x; @@ -859,7 +859,7 @@ return range < Radius; } -bool IsPointInBox(Coord X, Coord Y, BoxTypePtr box, Coord Radius) +pcb_bool IsPointInBox(Coord X, Coord Y, BoxTypePtr box, Coord Radius) { Coord width, height, range; @@ -894,7 +894,7 @@ else if (Y > height) range = Y - height; else - return true; + return pcb_true; } return range < Radius; @@ -904,7 +904,7 @@ * and in the case that the arc thickness is greater than * the radius. */ -bool IsPointOnArc(Coord X, Coord Y, Coord Radius, ArcTypePtr Arc) +pcb_bool IsPointOnArc(Coord X, Coord Y, Coord Radius, ArcTypePtr Arc) { /* Calculate angle of point from arc center */ double p_dist = Distance(X, Y, Arc->X, Arc->Y); @@ -938,13 +938,13 @@ ArcX = Arc->X + Arc->Width * cos((Arc->StartAngle + 180) / PCB_RAD_TO_DEG); ArcY = Arc->Y - Arc->Width * sin((Arc->StartAngle + 180) / PCB_RAD_TO_DEG); if (Distance(X, Y, ArcX, ArcY) < Radius + Arc->Thickness / 2) - return true; + return pcb_true; ArcX = Arc->X + Arc->Width * cos((Arc->StartAngle + Arc->Delta + 180) / PCB_RAD_TO_DEG); ArcY = Arc->Y - Arc->Width * sin((Arc->StartAngle + Arc->Delta + 180) / PCB_RAD_TO_DEG); if (Distance(X, Y, ArcX, ArcY) < Radius + Arc->Thickness / 2) - return true; - return false; + return pcb_true; + return pcb_false; } /* If point is inside the arc range, just compare it to the arc */ return fabs(Distance(X, Y, Arc->X, Arc->Y) - Arc->Width) < Radius + Arc->Thickness / 2; @@ -1010,11 +1010,11 @@ HigherAvail = PCB_TYPE_PIN; if (!HigherAvail && Type & PCB_TYPE_PAD && - SearchPadByLocation(locked, (ElementTypePtr *) pr1, (PadTypePtr *) pr2, (PadTypePtr *) pr3, false)) + SearchPadByLocation(locked, (ElementTypePtr *) pr1, (PadTypePtr *) pr2, (PadTypePtr *) pr3, pcb_false)) HigherAvail = PCB_TYPE_PAD; if (!HigherAvail && Type & PCB_TYPE_ELEMENT_NAME && - SearchElementNameByLocation(locked, (ElementTypePtr *) pr1, (TextTypePtr *) pr2, (TextTypePtr *) pr3, false)) { + SearchElementNameByLocation(locked, (ElementTypePtr *) pr1, (TextTypePtr *) pr2, (TextTypePtr *) pr3, pcb_false)) { BoxTypePtr box = &((TextTypePtr) r2)->BoundingBox; HigherBound = (double) (box->X2 - box->X1) * (double) (box->Y2 - box->Y1); HigherAvail = PCB_TYPE_ELEMENT_NAME; @@ -1021,7 +1021,7 @@ } if (!HigherAvail && Type & PCB_TYPE_ELEMENT && - SearchElementByLocation(locked, (ElementTypePtr *) pr1, (ElementTypePtr *) pr2, (ElementTypePtr *) pr3, false)) { + SearchElementByLocation(locked, (ElementTypePtr *) pr1, (ElementTypePtr *) pr2, (ElementTypePtr *) pr3, pcb_false)) { BoxTypePtr box = &((ElementTypePtr) r1)->BoundingBox; HigherBound = (double) (box->X2 - box->X1) * (double) (box->Y2 - box->Y1); HigherAvail = PCB_TYPE_ELEMENT; @@ -1109,15 +1109,15 @@ return (PCB_TYPE_NONE); if (Type & PCB_TYPE_PAD && - SearchPadByLocation(locked, (ElementTypePtr *) Result1, (PadTypePtr *) Result2, (PadTypePtr *) Result3, true)) + SearchPadByLocation(locked, (ElementTypePtr *) Result1, (PadTypePtr *) Result2, (PadTypePtr *) Result3, pcb_true)) return (PCB_TYPE_PAD); if (Type & PCB_TYPE_ELEMENT_NAME && - SearchElementNameByLocation(locked, (ElementTypePtr *) Result1, (TextTypePtr *) Result2, (TextTypePtr *) Result3, true)) + SearchElementNameByLocation(locked, (ElementTypePtr *) Result1, (TextTypePtr *) Result2, (TextTypePtr *) Result3, pcb_true)) return (PCB_TYPE_ELEMENT_NAME); if (Type & PCB_TYPE_ELEMENT && - SearchElementByLocation(locked, (ElementTypePtr *) Result1, (ElementTypePtr *) Result2, (ElementTypePtr *) Result3, true)) + SearchElementByLocation(locked, (ElementTypePtr *) Result1, (ElementTypePtr *) Result2, (ElementTypePtr *) Result3, pcb_true)) return (PCB_TYPE_ELEMENT); return (PCB_TYPE_NONE); Index: trunk/src/search.h =================================================================== --- trunk/src/search.h (revision 3382) +++ trunk/src/search.h (revision 3383) @@ -144,15 +144,15 @@ /* --------------------------------------------------------------------------- * prototypes */ -bool IsPointOnLine(Coord, Coord, Coord, LineTypePtr); -bool IsPointOnPin(Coord, Coord, Coord, PinTypePtr); -bool IsPointOnArc(Coord, Coord, Coord, ArcTypePtr); -bool IsPointOnLineEnd(Coord, Coord, RatTypePtr); -bool IsLineInRectangle(Coord, Coord, Coord, Coord, LineTypePtr); -bool IsLineInQuadrangle(PointType p[4], LineTypePtr Line); -bool IsArcInRectangle(Coord, Coord, Coord, Coord, ArcTypePtr); -bool IsPointInPad(Coord, Coord, Coord, PadTypePtr); -bool IsPointInBox(Coord, Coord, BoxTypePtr, Coord); +pcb_bool IsPointOnLine(Coord, Coord, Coord, LineTypePtr); +pcb_bool IsPointOnPin(Coord, Coord, Coord, PinTypePtr); +pcb_bool IsPointOnArc(Coord, Coord, Coord, ArcTypePtr); +pcb_bool IsPointOnLineEnd(Coord, Coord, RatTypePtr); +pcb_bool IsLineInRectangle(Coord, Coord, Coord, Coord, LineTypePtr); +pcb_bool IsLineInQuadrangle(PointType p[4], LineTypePtr Line); +pcb_bool IsArcInRectangle(Coord, Coord, Coord, Coord, ArcTypePtr); +pcb_bool IsPointInPad(Coord, Coord, Coord, PadTypePtr); +pcb_bool IsPointInBox(Coord, Coord, BoxTypePtr, Coord); int SearchObjectByLocation(unsigned, void **, void **, void **, Coord, Coord, Coord); int SearchScreen(Coord, Coord, int, void **, void **, void **); int SearchScreenGridSlop(Coord, Coord, int, void **, void **, void **); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 3382) +++ trunk/src/select.c (revision 3383) @@ -49,17 +49,17 @@ * toggles the selection of any kind of object * the different types are defined by search.h */ -bool SelectObject(void) +pcb_bool SelectObject(void) { void *ptr1, *ptr2, *ptr3; LayerTypePtr layer; int type; - bool changed = true; + pcb_bool changed = pcb_true; type = SearchScreen(Crosshair.X, Crosshair.Y, SELECT_TYPES, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_NONE || TEST_FLAG(PCB_FLAG_LOCK, (PinTypePtr) ptr2)) - return (false); + return (pcb_false); switch (type) { case PCB_TYPE_VIA: AddObjectToFlagUndoList(PCB_TYPE_VIA, ptr1, ptr1, ptr1); @@ -198,7 +198,7 @@ * returns a list of object IDs matched the search and loads len with the * length of the list. Returns NULL on no match. */ -static long int *ListBlock_(BoxTypePtr Box, bool Flag, int *len) +static long int *ListBlock_(BoxTypePtr Box, pcb_bool Flag, int *len) { int changed = 0; int used = 0, alloced = 0; @@ -306,7 +306,7 @@ ELEMENT_LOOP(PCB->Data); { { - bool gotElement = false; + pcb_bool gotElement = pcb_false; if ((PCB->ElementOn || !Flag) && !TEST_FLAG(PCB_FLAG_LOCK, element) && ((TEST_FLAG(PCB_FLAG_ONSOLDER, element) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn)) { @@ -345,7 +345,7 @@ END_LOOP; if (PCB->PinOn) DrawElement(element); - gotElement = true; + gotElement = pcb_true; } } if ((PCB->PinOn || !Flag) && !TEST_FLAG(PCB_FLAG_LOCK, element) && !gotElement) { @@ -408,12 +408,12 @@ /* ---------------------------------------------------------------------- * selects/unselects all visible objects within the passed box * Flag determines if the block is to be selected or unselected - * returns true if the state of any object has changed + * returns pcb_true if the state of any object has changed */ -bool SelectBlock(BoxTypePtr Box, bool Flag) +pcb_bool SelectBlock(BoxTypePtr Box, pcb_bool Flag) { /* do not list, set flag */ - return (ListBlock_(Box, Flag, NULL) == NULL) ? false : true; + return (ListBlock_(Box, Flag, NULL) == NULL) ? pcb_false : pcb_true; } /* ---------------------------------------------------------------------- @@ -497,11 +497,11 @@ * performs several operations on selected objects which are also visible * The lowlevel procedures are passed together with additional information * resets the selected flag if requested - * returns true if anything has changed + * returns pcb_true if anything has changed */ -bool SelectedOperation(ObjectFunctionTypePtr F, bool Reset, int type) +pcb_bool SelectedOperation(ObjectFunctionTypePtr F, pcb_bool Reset, int type) { - bool changed = false; + pcb_bool changed = pcb_false; /* check lines */ if (type & PCB_TYPE_LINE && F->Line) @@ -513,7 +513,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, line); } F->Line(layer, line); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -528,7 +528,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, arc); } F->Arc(layer, arc); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -543,7 +543,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, text); } F->Text(layer, text); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -558,7 +558,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, polygon); } F->Polygon(layer, polygon); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -573,7 +573,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, element); } F->Element(element); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -586,7 +586,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element)); } F->ElementName(element); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -602,7 +602,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, pin); } F->Pin(element, pin); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -620,7 +620,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, pad); } F->Pad(element, pad); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -637,7 +637,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, via); } F->Via(via); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -651,7 +651,7 @@ CLEAR_FLAG(PCB_FLAG_SELECTED, line); } F->Rat(line); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -663,13 +663,13 @@ /* ---------------------------------------------------------------------- * selects/unselects all objects which were found during a connection scan * Flag determines if they are to be selected or unselected - * returns true if the state of any object has changed + * returns pcb_true if the state of any object has changed * * text objects and elements cannot be selected by this routine */ -bool SelectConnection(bool Flag) +pcb_bool SelectConnection(pcb_bool Flag) { - bool changed = false; + pcb_bool changed = pcb_false; if (PCB->RatOn) RAT_LOOP(PCB->Data); @@ -678,7 +678,7 @@ AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, line); DrawRat(line); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -689,7 +689,7 @@ AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, line); DrawLine(layer, line); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -699,7 +699,7 @@ AddObjectToFlagUndoList(PCB_TYPE_ARC, layer, arc, arc); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, arc); DrawArc(layer, arc); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -709,7 +709,7 @@ AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, polygon); DrawPolygon(layer, polygon); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -721,7 +721,7 @@ AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pin); DrawPin(pin); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -731,7 +731,7 @@ AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pad); DrawPad(pad); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -744,7 +744,7 @@ AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, via); DrawVia(via); - changed = true; + changed = pcb_true; } } END_LOOP; @@ -754,7 +754,7 @@ /* --------------------------------------------------------------------------- * selects objects as defined by Type by name; * it's a case insensitive match - * returns true if any object has been selected + * returns pcb_true if any object has been selected */ #define REGEXEC(arg) \ (method == SM_REGEX ? regexec_match_all(regex, (arg)) : strlst_match(pat, (arg))) @@ -774,9 +774,9 @@ return 0; } -bool SelectObjectByName(int Type, const char *name_pattern, bool Flag, search_method_t method) +pcb_bool SelectObjectByName(int Type, const char *name_pattern, pcb_bool Flag, search_method_t method) { - bool changed = false; + pcb_bool changed = pcb_false; const char **pat = NULL; char *pattern_copy = NULL; re_sei_t *regex; @@ -787,7 +787,7 @@ if (re_sei_errno(regex) != 0) { Message(PCB_MSG_DEFAULT, _("regexp error: %s\n"), re_error_str(re_sei_errno(regex))); re_sei_free(regex); - return (false); + return (pcb_false); } } else { @@ -838,7 +838,7 @@ AddObjectToFlagUndoList(PCB_TYPE_TEXT, layer, text, text); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, text); DrawText(layer, text); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -873,7 +873,7 @@ END_LOOP; DrawElementName(element); DrawElement(element); - changed = true; + changed = pcb_true; } } } @@ -887,7 +887,7 @@ AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pin); DrawPin(pin); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -901,7 +901,7 @@ AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pad); DrawPad(pad); - changed = true; + changed = pcb_true; } } ENDALL_LOOP; @@ -913,13 +913,13 @@ AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, via); DrawVia(via); - changed = true; + changed = pcb_true; } } END_LOOP; if (Type & PCB_TYPE_NET) { InitConnectionLookup(); - changed = ResetConnections(true) || changed; + changed = ResetConnections(pcb_true) || changed; MENU_LOOP(&(PCB->NetlistLib[NETLIST_EDITED])); { @@ -930,14 +930,14 @@ /* Name[0] and Name[1] are special purpose, not the actual name */ if (menu->Name && menu->Name[0] != '\0' && menu->Name[1] != '\0' && REGEXEC(menu->Name + 2)) { for (i = menu->EntryN, entry = menu->Entry; i; i--, entry++) - if (SeekPad(entry, &conn, false)) - RatFindHook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, true, true); + if (SeekPad(entry, &conn, pcb_false)) + RatFindHook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, pcb_true, pcb_true); } } END_LOOP; changed = SelectConnection(Flag) || changed; - changed = ResetConnections(false) || changed; + changed = ResetConnections(pcb_false) || changed; FreeConnectionLookupMemory(); } Index: trunk/src/select.h =================================================================== --- trunk/src/select.h (revision 3382) +++ trunk/src/select.h (revision 3383) @@ -35,12 +35,12 @@ (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_ELEMENT | \ PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_RATLINE | PCB_TYPE_ARC) -bool SelectObject(void); -bool SelectBlock(BoxTypePtr, bool); +pcb_bool SelectObject(void); +pcb_bool SelectBlock(BoxTypePtr, pcb_bool); long int *ListBlock(BoxTypePtr Box, int *len); -bool SelectedOperation(ObjectFunctionTypePtr, bool, int); +pcb_bool SelectedOperation(ObjectFunctionTypePtr, pcb_bool, int); void *ObjectOperation(ObjectFunctionTypePtr, int, void *, void *, void *); -bool SelectConnection(bool); +pcb_bool SelectConnection(pcb_bool); typedef enum { SM_REGEX = 0, @@ -47,6 +47,6 @@ SM_LIST = 1 } search_method_t; -bool SelectObjectByName(int, const char *, bool, search_method_t); +pcb_bool SelectObjectByName(int, const char *, pcb_bool, search_method_t); #endif Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 3382) +++ trunk/src/select_act.c (revision 3383) @@ -160,8 +160,8 @@ search_method_t method; if (pattern || (pattern = gui_get_pat(&method)) != NULL) { - if (SelectObjectByName(type, pattern, true, method)) - SetChangedFlag(true); + if (SelectObjectByName(type, pattern, pcb_true, method)) + SetChangedFlag(pcb_true); if (ACTION_ARG(1) == NULL) free((char*)pattern); } @@ -172,7 +172,7 @@ case F_ToggleObject: case F_Object: if (SelectObject()) - SetChangedFlag(true); + SetChangedFlag(pcb_true); break; /* all objects in block */ @@ -184,13 +184,13 @@ box.Y1 = MIN(Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.Y); box.X2 = MAX(Crosshair.AttachedBox.Point1.X, Crosshair.AttachedBox.Point2.X); box.Y2 = MAX(Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.Y); - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); NotifyBlock(); - if (Crosshair.AttachedBox.State == STATE_THIRD && SelectBlock(&box, true)) { - SetChangedFlag(true); + if (Crosshair.AttachedBox.State == STATE_THIRD && SelectBlock(&box, pcb_true)) { + SetChangedFlag(pcb_true); Crosshair.AttachedBox.State = STATE_FIRST; } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; } @@ -203,17 +203,17 @@ box.Y1 = -MAX_COORD; box.X2 = MAX_COORD; box.Y2 = MAX_COORD; - if (SelectBlock(&box, true)) - SetChangedFlag(true); + if (SelectBlock(&box, pcb_true)) + SetChangedFlag(pcb_true); break; } /* all found connections */ case F_Connection: - if (SelectConnection(true)) { + if (SelectConnection(pcb_true)) { Draw(); IncrementUndoSerialNumber(); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } break; @@ -226,7 +226,7 @@ gui->get_coords(_("Select the Element's Mark Location"), &x, &y); x = GridFit(x, PCB->Grid, PCB->GridOffsetX); y = GridFit(y, PCB->Grid, PCB->GridOffsetY); - AddSelectedToBuffer(PASTEBUFFER, x, y, true); + AddSelectedToBuffer(PASTEBUFFER, x, y, pcb_true); SaveUndoSerialNumber(); RemoveSelected(); ConvertBufferToElement(PASTEBUFFER); @@ -319,8 +319,8 @@ search_method_t method = SM_REGEX; if (pattern || (pattern = gui_get_pat(&method)) != NULL) { - if (SelectObjectByName(type, pattern, false, method)) - SetChangedFlag(true); + if (SelectObjectByName(type, pattern, pcb_false, method)) + SetChangedFlag(pcb_true); if (ACTION_ARG(1) == NULL) free((char*)pattern); } @@ -336,13 +336,13 @@ box.Y1 = MIN(Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.Y); box.X2 = MAX(Crosshair.AttachedBox.Point1.X, Crosshair.AttachedBox.Point2.X); box.Y2 = MAX(Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.Y); - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); NotifyBlock(); - if (Crosshair.AttachedBox.State == STATE_THIRD && SelectBlock(&box, false)) { - SetChangedFlag(true); + if (Crosshair.AttachedBox.State == STATE_THIRD && SelectBlock(&box, pcb_false)) { + SetChangedFlag(pcb_true); Crosshair.AttachedBox.State = STATE_FIRST; } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; } @@ -355,17 +355,17 @@ box.Y1 = -MAX_COORD; box.X2 = MAX_COORD; box.Y2 = MAX_COORD; - if (SelectBlock(&box, false)) - SetChangedFlag(true); + if (SelectBlock(&box, pcb_false)) + SetChangedFlag(pcb_true); break; } /* all found connections */ case F_Connection: - if (SelectConnection(false)) { + if (SelectConnection(pcb_false)) { Draw(); IncrementUndoSerialNumber(); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } break; Index: trunk/src/set.c =================================================================== --- trunk/src/set.c (revision 3382) +++ trunk/src/set.c (revision 3383) @@ -55,7 +55,7 @@ /* --------------------------------------------------------------------------- * sets cursor grid with respect to grid offset values */ -void SetGrid(Coord Grid, bool align) +void SetGrid(Coord Grid, pcb_bool align) { if (Grid >= 1 && Grid <= MAX_GRID) { if (align) { @@ -83,7 +83,7 @@ /* --------------------------------------------------------------------------- * sets a new via thickness */ -void SetViaSize(Coord Size, bool Force) +void SetViaSize(Coord Size, pcb_bool Force) { if (Force || (Size <= MAX_PINORVIASIZE && Size >= MIN_PINORVIASIZE && Size >= conf_core.design.via_drilling_hole + MIN_PINORVIACOPPER)) { conf_set_design("design/via_thickness", "%$mS", Size); @@ -93,7 +93,7 @@ /* --------------------------------------------------------------------------- * sets a new via drilling hole */ -void SetViaDrillingHole(Coord Size, bool Force) +void SetViaDrillingHole(Coord Size, pcb_bool Force) { if (Force || (Size <= MAX_PINORVIASIZE && Size >= MIN_PINORVIAHOLE && Size <= conf_core.design.via_thickness - MIN_PINORVIACOPPER)) { conf_set_design("design/via_drilling_hole", "%$mS", Size); @@ -123,7 +123,7 @@ /* --------------------------------------------------------------------------- * sets or resets changed flag and redraws status */ -void SetChangedFlag(bool New) +void SetChangedFlag(pcb_bool New) { if (PCB->Changed != New) { PCB->Changed = New; @@ -185,7 +185,7 @@ void SetMode(int Mode) { char sMode[32]; - static bool recursing = false; + static pcb_bool recursing = pcb_false; /* protect the cursor while changing the mode * perform some additional stuff depending on the new mode * reset 'state' of attached objects @@ -192,8 +192,8 @@ */ if (recursing) return; - recursing = true; - notify_crosshair_change(false); + recursing = pcb_true; + notify_crosshair_change(pcb_false); addedLines = 0; Crosshair.AttachedObject.Type = PCB_TYPE_NONE; Crosshair.AttachedObject.State = STATE_FIRST; @@ -224,11 +224,11 @@ } else { if (conf_core.editor.mode == PCB_MODE_ARC || conf_core.editor.mode == PCB_MODE_LINE) - SetLocalRef(0, 0, false); + SetLocalRef(0, 0, pcb_false); Crosshair.AttachedBox.State = STATE_FIRST; Crosshair.AttachedLine.State = STATE_FIRST; if (Mode == PCB_MODE_LINE && conf_core.editor.auto_drc) { - if (ResetConnections(true)) { + if (ResetConnections(pcb_true)) { IncrementUndoSerialNumber(); Draw(); } @@ -244,34 +244,34 @@ else SetCrosshairRange(0, 0, PCB->MaxWidth, PCB->MaxHeight); - recursing = false; + recursing = pcb_false; /* force a crosshair grid update because the valid range * may have changed */ MoveCrosshairRelative(0, 0); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); } -void SetLocalRef(Coord X, Coord Y, bool Showing) +void SetLocalRef(Coord X, Coord Y, pcb_bool Showing) { static MarkType old; static int count = 0; if (Showing) { - notify_mark_change(false); + notify_mark_change(pcb_false); if (count == 0) old = Marked; Marked.X = X; Marked.Y = Y; - Marked.status = true; + Marked.status = pcb_true; count++; - notify_mark_change(true); + notify_mark_change(pcb_true); } else if (count > 0) { - notify_mark_change(false); + notify_mark_change(pcb_false); count = 0; Marked = old; - notify_mark_change(true); + notify_mark_change(pcb_true); } } Index: trunk/src/set.h =================================================================== --- trunk/src/set.h (revision 3382) +++ trunk/src/set.h (revision 3383) @@ -32,17 +32,17 @@ #include "global.h" void SetTextScale(int); -void SetGrid(Coord, bool); +void SetGrid(Coord, pcb_bool); void SetZoom(double); void SetLineSize(Coord); -void SetViaSize(Coord, bool); -void SetViaDrillingHole(Coord, bool); +void SetViaSize(Coord, pcb_bool); +void SetViaDrillingHole(Coord, pcb_bool); void SetClearanceWidth(Coord); -void SetChangedFlag(bool); +void SetChangedFlag(pcb_bool); void SetBufferNumber(int); void SetMode(int); void SetCrosshairRangeToBuffer(void); -void SetLocalRef(Coord, Coord, bool); +void SetLocalRef(Coord, Coord, pcb_bool); void RedrawZoom(Coord, Coord); void SaveMode(void); void RestoreMode(void); Index: trunk/src/stub_stroke.c =================================================================== --- trunk/src/stub_stroke.c (revision 3382) +++ trunk/src/stub_stroke.c (revision 3383) @@ -19,10 +19,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ -#include #include "error.h" +#include "pcb_bool.h" -bool mid_stroke = false; +pcb_bool mid_stroke = pcb_false; static void stub_stroke_record_dummy(int ev_x, int ev_y) { Index: trunk/src/stub_stroke.h =================================================================== --- trunk/src/stub_stroke.h (revision 3382) +++ trunk/src/stub_stroke.h (revision 3383) @@ -20,7 +20,7 @@ * */ -extern bool mid_stroke; +extern pcb_bool mid_stroke; extern void (*stub_stroke_record)(int ev_x, int ev_y); extern void (*stub_stroke_start)(void); extern void (*stub_stroke_finish)(void); Index: trunk/src/stub_vendor.c =================================================================== --- trunk/src/stub_vendor.c (revision 3382) +++ trunk/src/stub_vendor.c (revision 3383) @@ -27,12 +27,12 @@ return dia; } -static bool stub_vendorIsElementMappable_dummy(ElementTypePtr e) +static pcb_bool stub_vendorIsElementMappable_dummy(ElementTypePtr e) { - return false; + return pcb_false; } int (*stub_vendorDrillMap)(int) = stub_vendorDrillMap_dummy; -bool (*stub_vendorIsElementMappable)(ElementTypePtr) = stub_vendorIsElementMappable_dummy; +pcb_bool (*stub_vendorIsElementMappable)(ElementTypePtr) = stub_vendorIsElementMappable_dummy; Index: trunk/src/stub_vendor.h =================================================================== --- trunk/src/stub_vendor.h (revision 3382) +++ trunk/src/stub_vendor.h (revision 3383) @@ -27,6 +27,6 @@ #include "global.h" extern int (*stub_vendorDrillMap)(int); -extern bool (*stub_vendorIsElementMappable)(ElementTypePtr); +extern pcb_bool (*stub_vendorIsElementMappable)(ElementTypePtr); #endif /* __VENDOR_H__ */ Index: trunk/src/thermal.c =================================================================== --- trunk/src/thermal.c (revision 3382) +++ trunk/src/thermal.c (revision 3383) @@ -47,7 +47,7 @@ POLYAREA *p; }; -static POLYAREA *diag_line(Coord X, Coord Y, Coord l, Coord w, bool rt) +static POLYAREA *diag_line(Coord X, Coord Y, Coord l, Coord w, pcb_bool rt) { PLINE *c; Vector v; @@ -322,9 +322,9 @@ switch (style) { default: case 1: - p = diag_line(pin->X, pin->Y, w, t, true); + p = diag_line(pin->X, pin->Y, w, t, pcb_true); poly_Boolean_free(m, p, &p2, PBO_SUB); - p = diag_line(pin->X, pin->Y, w, t, false); + p = diag_line(pin->X, pin->Y, w, t, pcb_false); poly_Boolean_free(p2, p, &m, PBO_SUB); return m; case 2: @@ -391,9 +391,9 @@ /* t is the theoretically required length, but we use twice that * to avoid descritisation errors in our circle approximation. */ - pa = diag_line(pin->X, pin->Y, t * 2, w, true); + pa = diag_line(pin->X, pin->Y, t * 2, w, pcb_true); poly_Boolean_free(m, pa, &arc, PBO_SUB); - pa = diag_line(pin->X, pin->Y, t * 2, w, false); + pa = diag_line(pin->X, pin->Y, t * 2, w, pcb_false); } poly_Boolean_free(arc, pa, &m, PBO_SUB); return m; Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 3382) +++ trunk/src/undo.c (revision 3383) @@ -67,8 +67,8 @@ #include "conf_core.h" #include "compat_misc.h" -static bool between_increment_and_restore = false; -static bool added_undo_between_increment_and_restore = false; +static pcb_bool between_increment_and_restore = pcb_false; +static pcb_bool added_undo_between_increment_and_restore = pcb_false; /* --------------------------------------------------------------------------- * some local data types @@ -85,7 +85,7 @@ Coord X, Y; /* data */ int ID; Cardinal Index; /* index in a polygons array of points */ - bool last_in_contour; /* Whether the point was the last in its contour */ + pcb_bool last_in_contour; /* Whether the point was the last in its contour */ } RemovedPointType, *RemovedPointTypePtr; typedef struct { /* information about rotation */ @@ -103,7 +103,7 @@ } LayerChangeType, *LayerChangeTypePtr; typedef struct { /* information about poly clear/restore */ - bool Clear; /* true was clear, false was restore */ + pcb_bool Clear; /* pcb_true was clear, pcb_false was restore */ LayerTypePtr Layer; } ClearPolyType, *ClearPolyTypePtr; @@ -141,8 +141,8 @@ SavedSerial; static size_t UndoN, RedoN, /* number of entries */ UndoMax; -static bool Locked = false; /* do not add entries if */ -static bool andDraw = true; +static pcb_bool Locked = pcb_false; /* do not add entries if */ +static pcb_bool andDraw = pcb_true; /* flag is set; prevents from */ /* infinite loops */ @@ -151,24 +151,24 @@ */ static UndoListTypePtr GetUndoSlot(int, int, int); static void DrawRecoveredObject(int, void *, void *, void *); -static bool UndoRotate(UndoListTypePtr); -static bool UndoChangeName(UndoListTypePtr); -static bool UndoCopyOrCreate(UndoListTypePtr); -static bool UndoMove(UndoListTypePtr); -static bool UndoRemove(UndoListTypePtr); -static bool UndoRemovePoint(UndoListTypePtr); -static bool UndoInsertPoint(UndoListTypePtr); -static bool UndoRemoveContour(UndoListTypePtr); -static bool UndoInsertContour(UndoListTypePtr); -static bool UndoMoveToLayer(UndoListTypePtr); -static bool UndoFlag(UndoListTypePtr); -static bool UndoMirror(UndoListTypePtr); -static bool UndoChangeSize(UndoListTypePtr); -static bool UndoChange2ndSize(UndoListTypePtr); -static bool UndoChangeAngles(UndoListTypePtr); -static bool UndoChangeClearSize(UndoListTypePtr); -static bool UndoChangeMaskSize(UndoListTypePtr); -static bool UndoClearPoly(UndoListTypePtr); +static pcb_bool UndoRotate(UndoListTypePtr); +static pcb_bool UndoChangeName(UndoListTypePtr); +static pcb_bool UndoCopyOrCreate(UndoListTypePtr); +static pcb_bool UndoMove(UndoListTypePtr); +static pcb_bool UndoRemove(UndoListTypePtr); +static pcb_bool UndoRemovePoint(UndoListTypePtr); +static pcb_bool UndoInsertPoint(UndoListTypePtr); +static pcb_bool UndoRemoveContour(UndoListTypePtr); +static pcb_bool UndoInsertContour(UndoListTypePtr); +static pcb_bool UndoMoveToLayer(UndoListTypePtr); +static pcb_bool UndoFlag(UndoListTypePtr); +static pcb_bool UndoMirror(UndoListTypePtr); +static pcb_bool UndoChangeSize(UndoListTypePtr); +static pcb_bool UndoChange2ndSize(UndoListTypePtr); +static pcb_bool UndoChangeAngles(UndoListTypePtr); +static pcb_bool UndoChangeClearSize(UndoListTypePtr); +static pcb_bool UndoChangeMaskSize(UndoListTypePtr); +static pcb_bool UndoClearPoly(UndoListTypePtr); static int PerformUndo(UndoListTypePtr); /* --------------------------------------------------------------------------- @@ -222,7 +222,7 @@ } if (between_increment_and_restore) - added_undo_between_increment_and_restore = true; + added_undo_between_increment_and_restore = pcb_true; /* copy typefield and serial number to the list */ ptr = &UndoList[UndoN++]; @@ -250,9 +250,9 @@ /* --------------------------------------------------------------------------- * recovers an object from a 'rotate' operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoRotate(UndoListTypePtr Entry) +static pcb_bool UndoRotate(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -263,16 +263,16 @@ RotateObject(type, ptr1, ptr2, ptr3, Entry->Data.Rotate.CenterX, Entry->Data.Rotate.CenterY, (4 - Entry->Data.Rotate.Steps) & 0x03); Entry->Data.Rotate.Steps = (4 - Entry->Data.Rotate.Steps) & 0x03; - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a clear/restore poly operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoClearPoly(UndoListTypePtr Entry) +static pcb_bool UndoClearPoly(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -284,16 +284,16 @@ else ClearFromPolygon(PCB->Data, type, Entry->Data.ClearPoly.Layer, ptr3); Entry->Data.ClearPoly.Clear = !Entry->Data.ClearPoly.Clear; - return true; + return pcb_true; } - return false; + return pcb_false; } /* --------------------------------------------------------------------------- * recovers an object from a 'change name' operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoChangeName(UndoListTypePtr Entry) +static pcb_bool UndoChangeName(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -302,16 +302,16 @@ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { Entry->Data.ChangeName.Name = (char *) (ChangeObjectName(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a 'change oinnum' operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoChangePinnum(UndoListTypePtr Entry) +static pcb_bool UndoChangePinnum(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -320,15 +320,15 @@ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { Entry->Data.ChangeName.Name = (char *) (ChangeObjectPinnum(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a 2ndSize change operation */ -static bool UndoChange2ndSize(UndoListTypePtr Entry) +static pcb_bool UndoChange2ndSize(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -343,15 +343,15 @@ ((PinTypePtr) ptr2)->DrillingHole = Entry->Data.Size; Entry->Data.Size = swap; DrawObject(type, ptr1, ptr2); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a ChangeAngles change operation */ -static bool UndoChangeAngles(UndoListTypePtr Entry) +static pcb_bool UndoChangeAngles(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -374,15 +374,15 @@ Entry->Data.Move.DX = old_sa; Entry->Data.Move.DY = old_da;; DrawObject(type, ptr1, a); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a clearance size change operation */ -static bool UndoChangeClearSize(UndoListTypePtr Entry) +static pcb_bool UndoChangeClearSize(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -400,15 +400,15 @@ Entry->Data.Size = swap; if (andDraw) DrawObject(type, ptr1, ptr2); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a mask size change operation */ -static bool UndoChangeMaskSize(UndoListTypePtr Entry) +static pcb_bool UndoChangeMaskSize(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -427,9 +427,9 @@ Entry->Data.Size = swap; if (andDraw) DrawObject(type, ptr1, ptr2); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } @@ -436,7 +436,7 @@ /* --------------------------------------------------------------------------- * recovers an object from a Size change operation */ -static bool UndoChangeSize(UndoListTypePtr Entry) +static pcb_bool UndoChangeSize(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -456,15 +456,15 @@ ClearFromPolygon(PCB->Data, type, ptr1, ptr2); if (andDraw) DrawObject(type, ptr1, ptr2); - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a FLAG change operation */ -static bool UndoFlag(UndoListTypePtr Entry) +static pcb_bool UndoFlag(UndoListTypePtr Entry) { void *ptr1, *ptr1e, *ptr2, *ptr3; int type; @@ -500,18 +500,18 @@ if (andDraw && must_redraw) DrawObject(type, ptr1, ptr2); - return (true); + return (pcb_true); } Message(PCB_MSG_DEFAULT, "hace Internal error: Can't find ID %d type %08x\n", Entry->ID, Entry->Kind); Message(PCB_MSG_DEFAULT, "for UndoFlag Operation. Previous flags: %s\n", flags_to_string(Entry->Data.Flags, 0)); - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a mirror operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoMirror(UndoListTypePtr Entry) +static pcb_bool UndoMirror(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -525,17 +525,17 @@ MirrorElementCoordinates(PCB->Data, element, Entry->Data.Move.DY); if (andDraw) DrawElement(element); - return (true); + return (pcb_true); } Message(PCB_MSG_DEFAULT, "hace Internal error: UndoMirror on object type %d\n", type); - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a 'copy' or 'create' operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoCopyOrCreate(UndoListTypePtr Entry) +static pcb_bool UndoCopyOrCreate(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -550,16 +550,16 @@ /* in order to make this re-doable we move it to the RemoveList */ MoveObjectToBuffer(RemoveList, PCB->Data, type, ptr1, ptr2, ptr3); Entry->Type = UNDO_REMOVE; - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers an object from a 'move' operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoMove(UndoListTypePtr Entry) +static pcb_bool UndoMove(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -570,16 +570,16 @@ MoveObject(type, ptr1, ptr2, ptr3, -Entry->Data.Move.DX, -Entry->Data.Move.DY); Entry->Data.Move.DX *= -1; Entry->Data.Move.DY *= -1; - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* ---------------------------------------------------------------------- * recovers an object from a 'remove' operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoRemove(UndoListTypePtr Entry) +static pcb_bool UndoRemove(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type; @@ -591,16 +591,16 @@ DrawRecoveredObject(type, ptr1, ptr2, ptr3); MoveObjectToBuffer(PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); Entry->Type = UNDO_CREATE; - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* ---------------------------------------------------------------------- * recovers an object from a 'move to another layer' operation - * returns true if anything has been recovered + * returns pcb_true if anything has been recovered */ -static bool UndoMoveToLayer(UndoListTypePtr Entry) +static pcb_bool UndoMoveToLayer(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; int type, swap; @@ -609,18 +609,18 @@ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { swap = GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1); - MoveObjectToLayer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), true); + MoveObjectToLayer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), pcb_true); Entry->Data.MoveToLayer.OriginalLayer = swap; - return (true); + return (pcb_true); } - return (false); + return (pcb_false); } /* --------------------------------------------------------------------------- * recovers a removed polygon point - * returns true on success + * returns pcb_true on success */ -static bool UndoRemovePoint(UndoListTypePtr Entry) +static pcb_bool UndoRemovePoint(UndoListTypePtr Entry) { LayerTypePtr layer; PolygonTypePtr polygon; @@ -639,7 +639,7 @@ InsertPointIntoObject(PCB_TYPE_POLYGON, layer, polygon, &Entry->Data.RemovedPoint.Index, Entry->Data.RemovedPoint.X, - Entry->Data.RemovedPoint.Y, true, Entry->Data.RemovedPoint.last_in_contour); + Entry->Data.RemovedPoint.Y, pcb_true, Entry->Data.RemovedPoint.last_in_contour); polygon->Points[Entry->Data.RemovedPoint.Index].ID = Entry->Data.RemovedPoint.ID; if (andDraw && layer->On) @@ -647,19 +647,19 @@ Entry->Type = UNDO_INSERT_POINT; Entry->ID = Entry->Data.RemovedPoint.ID; Entry->Kind = PCB_TYPE_POLYGON_POINT; - return (true); + return (pcb_true); } default: - return (false); + return (pcb_false); } } /* --------------------------------------------------------------------------- * recovers an inserted polygon point - * returns true on success + * returns pcb_true on success */ -static bool UndoInsertPoint(UndoListTypePtr Entry) +static pcb_bool UndoInsertPoint(UndoListTypePtr Entry) { LayerTypePtr layer; PolygonTypePtr polygon; @@ -667,7 +667,7 @@ int type; Cardinal point_idx; Cardinal hole; - bool last_in_contour = false; + pcb_bool last_in_contour = pcb_false; assert(Entry->Kind == PCB_TYPE_POLYGON_POINT); /* lookup entry by it's ID */ @@ -685,9 +685,9 @@ point_idx = polygon_point_idx(polygon, pnt); for (hole = 0; hole < polygon->HoleIndexN; hole++) if (point_idx == polygon->HoleIndex[hole] - 1) - last_in_contour = true; + last_in_contour = pcb_true; if (point_idx == polygon->PointN - 1) - last_in_contour = true; + last_in_contour = pcb_true; Entry->Data.RemovedPoint.last_in_contour = last_in_contour; Entry->Data.RemovedPoint.X = pnt->X; @@ -700,15 +700,15 @@ DestroyObject(PCB->Data, PCB_TYPE_POLYGON_POINT, layer, polygon, pnt); if (andDraw && layer->On) DrawPolygon(layer, polygon); - return (true); + return (pcb_true); } default: - return (false); + return (pcb_false); } } -static bool UndoSwapCopiedObject(UndoListTypePtr Entry) +static pcb_bool UndoSwapCopiedObject(UndoListTypePtr Entry) { void *ptr1, *ptr2, *ptr3; void *ptr1b, *ptr2b, *ptr3b; @@ -719,7 +719,7 @@ /* lookup entry by it's ID */ type = SearchObjectByID(RemoveList, &ptr1, &ptr2, &ptr3, Entry->Data.CopyID, Entry->Kind); if (type == PCB_TYPE_NONE) - return false; + return pcb_false; type = SearchObjectByID(PCB->Data, &ptr1b, &ptr2b, &ptr3b, Entry->ID, Entry->Kind); if (type == PCB_TYPE_NONE) @@ -740,14 +740,14 @@ obj = (AnyObjectType *) MoveObjectToBuffer(PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); if (Entry->Kind == PCB_TYPE_POLYGON) InitClip(PCB->Data, (LayerTypePtr) ptr1b, (PolygonType *) obj); - return (true); + return (pcb_true); } /* --------------------------------------------------------------------------- * recovers an removed polygon point - * returns true on success + * returns pcb_true on success */ -static bool UndoRemoveContour(UndoListTypePtr Entry) +static pcb_bool UndoRemoveContour(UndoListTypePtr Entry) { assert(Entry->Kind == PCB_TYPE_POLYGON); return UndoSwapCopiedObject(Entry); @@ -755,9 +755,9 @@ /* --------------------------------------------------------------------------- * recovers an inserted polygon point - * returns true on success + * returns pcb_true on success */ -static bool UndoInsertContour(UndoListTypePtr Entry) +static pcb_bool UndoInsertContour(UndoListTypePtr Entry) { assert(Entry->Kind == PCB_TYPE_POLYGON); return UndoSwapCopiedObject(Entry); @@ -765,9 +765,9 @@ /* --------------------------------------------------------------------------- * undo a layer change - * returns true on success + * returns pcb_true on success */ -static bool UndoLayerChange(UndoListTypePtr Entry) +static pcb_bool UndoLayerChange(UndoListTypePtr Entry) { LayerChangeTypePtr l = &Entry->Data.LayerChange; int tmp; @@ -777,16 +777,16 @@ l->old_index = tmp; if (MoveLayer(l->old_index, l->new_index)) - return false; + return pcb_false; else - return true; + return pcb_true; } /* --------------------------------------------------------------------------- * undo a netlist change - * returns true on success + * returns pcb_true on success */ -static bool UndoNetlistChange(UndoListTypePtr Entry) +static pcb_bool UndoNetlistChange(UndoListTypePtr Entry) { NetlistChangeTypePtr l = &Entry->Data.NetlistChange; unsigned int i, j; @@ -817,7 +817,7 @@ *lib = *saved; NetlistChanged(0); - return true; + return pcb_true; } /* --------------------------------------------------------------------------- @@ -825,12 +825,12 @@ * * returns the bitfield for the types of operations that were undone */ -int Undo(bool draw) +int Undo(pcb_bool draw) { UndoListTypePtr ptr; int Types = 0; int unique; - bool error_undoing = false; + pcb_bool error_undoing = pcb_false; unique = conf_core.editor.unique_names; conf_force_set_bool(conf_core.editor.unique_names, 0); @@ -872,7 +872,7 @@ for (; UndoN && ptr->Serial == Serial; ptr--, UndoN--, RedoN++) { int undid = PerformUndo(ptr); if (undid == 0) - error_undoing = true; + error_undoing = pcb_true; Types |= undid; } @@ -1006,11 +1006,11 @@ * * returns the number of operations redone */ -int Redo(bool draw) +int Redo(pcb_bool draw) { UndoListTypePtr ptr; int Types = 0; - bool error_undoing = false; + pcb_bool error_undoing = pcb_false; andDraw = draw; @@ -1042,7 +1042,7 @@ for (; RedoN && ptr->Serial == Serial; ptr++, UndoN++, RedoN--) { int undid = PerformUndo(ptr); if (undid == 0) - error_undoing = true; + error_undoing = pcb_true; Types |= undid; } @@ -1067,8 +1067,8 @@ { if (added_undo_between_increment_and_restore) Message(PCB_MSG_DEFAULT, _("ERROR: Operations were added to the Undo stack with an incorrect serial number\n")); - between_increment_and_restore = false; - added_undo_between_increment_and_restore = false; + between_increment_and_restore = pcb_false; + added_undo_between_increment_and_restore = pcb_false; Serial = SavedSerial; } @@ -1077,9 +1077,9 @@ */ void SaveUndoSerialNumber(void) { - Bumped = false; - between_increment_and_restore = false; - added_undo_between_increment_and_restore = false; + Bumped = pcb_false; + between_increment_and_restore = pcb_false; + added_undo_between_increment_and_restore = pcb_false; SavedSerial = Serial; } @@ -1093,10 +1093,10 @@ if (!Locked) { /* Set the changed flag if anything was added prior to this bump */ if (UndoN > 0 && UndoList[UndoN - 1].Serial == Serial) - SetChangedFlag(true); + SetChangedFlag(pcb_true); Serial++; - Bumped = true; - between_increment_and_restore = true; + Bumped = pcb_true; + between_increment_and_restore = pcb_true; } } @@ -1103,7 +1103,7 @@ /* --------------------------------------------------------------------------- * releases memory of the undo- and remove list */ -void ClearUndoList(bool Force) +void ClearUndoList(pcb_bool Force) { UndoListTypePtr undo; @@ -1132,7 +1132,7 @@ /* --------------------------------------------------------------------------- * adds an object to the list of clearpoly objects */ -void AddObjectToClearPolyUndoList(int Type, void *Ptr1, void *Ptr2, void *Ptr3, bool clear) +void AddObjectToClearPolyUndoList(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_bool clear) { UndoListTypePtr undo; @@ -1195,7 +1195,7 @@ UndoListTypePtr undo; PolygonTypePtr polygon = (PolygonTypePtr) Ptr2; Cardinal hole; - bool last_in_contour = false; + pcb_bool last_in_contour = pcb_false; if (!Locked) { switch (Type) { @@ -1216,9 +1216,9 @@ */ for (hole = 0; hole < polygon->HoleIndexN; hole++) if (index == polygon->HoleIndex[hole] - 1) - last_in_contour = true; + last_in_contour = pcb_true; if (index == polygon->PointN - 1) - last_in_contour = true; + last_in_contour = pcb_true; undo->Data.RemovedPoint.last_in_contour = last_in_contour; } break; @@ -1538,7 +1538,7 @@ */ void LockUndo(void) { - Locked = true; + Locked = pcb_true; } /* --------------------------------------------------------------------------- @@ -1546,13 +1546,13 @@ */ void UnlockUndo(void) { - Locked = false; + Locked = pcb_false; } /* --------------------------------------------------------------------------- * return undo lock state */ -bool Undoing(void) +pcb_bool Undoing(void) { return (Locked); } Index: trunk/src/undo.h =================================================================== --- trunk/src/undo.h (revision 3382) +++ trunk/src/undo.h (revision 3383) @@ -36,12 +36,12 @@ /* different layers */ -int Undo(bool); -int Redo(bool); +int Undo(pcb_bool); +int Redo(pcb_bool); void IncrementUndoSerialNumber(void); void SaveUndoSerialNumber(void); void RestoreUndoSerialNumber(void); -void ClearUndoList(bool); +void ClearUndoList(pcb_bool); void MoveObjectToRemoveUndoList(int, void *, void *, void *); void AddObjectToRemovePointUndoList(int, void *, void *, Cardinal); void AddObjectToInsertPointUndoList(int, void *, void *, void *); @@ -60,12 +60,12 @@ void AddObjectToClearSizeUndoList(int, void *, void *, void *); void AddObjectToMaskSizeUndoList(int, void *, void *, void *); void AddObjectToChangeAnglesUndoList(int, void *, void *, void *); -void AddObjectToClearPolyUndoList(int, void *, void *, void *, bool); +void AddObjectToClearPolyUndoList(int, void *, void *, void *, pcb_bool); void AddLayerChangeToUndoList(int, int); void AddNetlistLibToUndoList(LibraryTypePtr); void LockUndo(void); void UnlockUndo(void); -bool Undoing(void); +pcb_bool Undoing(void); /* Publish actions - these may be useful for other actions */ int ActionUndo(int argc, const char **argv, Coord x, Coord y); Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 3382) +++ trunk/src/undo_act.c (revision 3383) @@ -136,10 +136,10 @@ return 1; /* undo the last operation */ - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); if ((conf_core.editor.mode == PCB_MODE_POLYGON || conf_core.editor.mode == PCB_MODE_POLYGON_HOLE) && Crosshair.AttachedPolygon.PointN) { GoToPreviousPoint(); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } /* move anchor point if undoing during line creation */ @@ -146,10 +146,10 @@ if (conf_core.editor.mode == PCB_MODE_LINE) { if (Crosshair.AttachedLine.State == STATE_SECOND) { if (conf_core.editor.auto_drc) - Undo(true); /* undo the connection find */ + Undo(pcb_true); /* undo the connection find */ Crosshair.AttachedLine.State = STATE_FIRST; - SetLocalRef(0, 0, false); - notify_crosshair_change(true); + SetLocalRef(0, 0, pcb_false); + notify_crosshair_change(pcb_true); return 0; } if (Crosshair.AttachedLine.State == STATE_THIRD) { @@ -164,14 +164,14 @@ /* save both ends of line */ Crosshair.AttachedLine.Point2.X = ptr2->Point1.X; Crosshair.AttachedLine.Point2.Y = ptr2->Point1.Y; - if ((type = Undo(true))) - SetChangedFlag(true); + if ((type = Undo(pcb_true))) + SetChangedFlag(pcb_true); /* check that the undo was of the right type */ if ((type & UNDO_CREATE) == 0) { /* wrong undo type, restore anchor points */ Crosshair.AttachedLine.Point2.X = Crosshair.AttachedLine.Point1.X; Crosshair.AttachedLine.Point2.Y = Crosshair.AttachedLine.Point1.Y; - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } /* move to new anchor */ @@ -204,7 +204,7 @@ ptr2 = (LineTypePtr) ptrtmp; lastLayer = (LayerTypePtr) ptr1; } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } } @@ -211,7 +211,7 @@ if (conf_core.editor.mode == PCB_MODE_ARC) { if (Crosshair.AttachedBox.State == STATE_SECOND) { Crosshair.AttachedBox.State = STATE_FIRST; - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } if (Crosshair.AttachedBox.State == STATE_THIRD) { @@ -229,18 +229,18 @@ } } /* undo the last destructive operation */ - if (Undo(true)) - SetChangedFlag(true); + if (Undo(pcb_true)) + SetChangedFlag(pcb_true); } else if (function) { switch (funchash_get(function, NULL)) { /* clear 'undo objects' list */ case F_ClearList: - ClearUndoList(false); + ClearUndoList(pcb_false); break; } } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } @@ -270,9 +270,9 @@ if (((conf_core.editor.mode == PCB_MODE_POLYGON || conf_core.editor.mode == PCB_MODE_POLYGON_HOLE) && Crosshair.AttachedPolygon.PointN) || Crosshair.AttachedLine.State == STATE_SECOND) return 1; - notify_crosshair_change(false); - if (Redo(true)) { - SetChangedFlag(true); + notify_crosshair_change(pcb_false); + if (Redo(pcb_true)) { + SetChangedFlag(pcb_true); if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST) { LineType *line = linelist_last(&CURRENT->Line); Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = line->Point2.X; @@ -280,7 +280,7 @@ addedLines++; } } - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); return 0; } Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 3382) +++ trunk/src_plugins/autoplace/action.c (revision 3383) @@ -48,7 +48,7 @@ hid_action("Busy"); if (gui->confirm_dialog(_("Auto-placement can NOT be undone.\n" "Do you want to continue anyway?\n"), 0)) { if (AutoPlaceSelected()) - SetChangedFlag(true); + SetChangedFlag(pcb_true); } return 0; } Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 3382) +++ trunk/src_plugins/autoplace/autoplace.c (revision 3383) @@ -91,7 +91,7 @@ double m; /* annealing stage cutoff constant */ double gamma; /* annealing schedule constant */ int good_ratio; /* ratio of moves to good moves for halting */ - bool fast; /* ignore SMD/pin conflicts */ + pcb_bool fast; /* ignore SMD/pin conflicts */ Coord large_grid_size; /* snap perturbations to this grid when T is high */ Coord small_grid_size; /* snap to this grid when T is small. */ } @@ -109,7 +109,7 @@ 20, /* move on when each module has been profitably moved 20 times */ 0.75, /* annealing schedule constant: 0.85 */ 40, /* halt when there are 60 times as many moves as good moves */ - false, /* don't ignore SMD/pin conflicts */ + pcb_false, /* don't ignore SMD/pin conflicts */ PCB_MIL_TO_COORD(100), /* coarse grid is 100 mils */ PCB_MIL_TO_COORD(10), /* fine grid is 10 mils */ }; @@ -300,7 +300,7 @@ double delta5 = 0; /* total area penalty */ Cardinal i, j; Coord minx, maxx, miny, maxy; - bool allpads, allsameside; + pcb_bool allpads, allsameside; Cardinal thegroup; BoxListType bounds = { 0, 0, NULL }; /* save bounding rectangles here */ BoxListType solderside = { 0, 0, NULL }; /* solder side component bounds */ @@ -319,7 +319,7 @@ miny = maxy = n->Connection[0].Y; thegroup = n->Connection[0].group; allpads = (n->Connection[0].type == PCB_TYPE_PAD); - allsameside = true; + allsameside = pcb_true; for (j = 1; j < n->ConnectionN; j++) { ConnectionTypePtr c = &(n->Connection[j]); MAKEMIN(minx, c->X); @@ -327,9 +327,9 @@ MAKEMIN(miny, c->Y); MAKEMAX(maxy, c->Y); if (c->type != PCB_TYPE_PAD) - allpads = false; + allpads = pcb_false; if (c->group != thegroup) - allsameside = false; + allsameside = pcb_false; } /* save bounding rectangle */ { @@ -577,7 +577,7 @@ case 1: { /* flip/rotate! */ /* only flip if it's an SMD component */ - bool isSMD = padlist_length(&(pt.element->Pad)) != 0; + pcb_bool isSMD = padlist_length(&(pt.element->Pad)) != 0; pt.which = ROTATE; pt.rotate = isSMD ? (pcb_rand() & 3) : (1 + (pcb_rand() % 3)); /* 0 - flip; 1-3, rotate. */ @@ -604,7 +604,7 @@ return pt; } -void doPerturb(PerturbationType * pt, bool undo) +void doPerturb(PerturbationType * pt, pcb_bool undo) { Coord bbcx, bbcy; /* compute center of element bounding box */ @@ -668,13 +668,13 @@ /* --------------------------------------------------------------------------- * Auto-place selected components. */ -bool AutoPlaceSelected(void) +pcb_bool AutoPlaceSelected(void) { NetListTypePtr Nets; PointerListType Selected = { 0, 0, NULL }; PerturbationType pt; double C0, T0; - bool changed = false; + pcb_bool changed = pcb_false; /* (initial netlist processing copied from AddAllRats) */ /* the netlist library has the text form @@ -703,9 +703,9 @@ C0 = ComputeCost(Nets, Tx, Tx); for (i = 0; i < TRIALS; i++) { pt = createPerturbation(&Selected, PCB_INCH_TO_COORD(1)); - doPerturb(&pt, false); + doPerturb(&pt, pcb_false); Cs += fabs(ComputeCost(Nets, Tx, Tx) - C0); - doPerturb(&pt, true); + doPerturb(&pt, pcb_true); } T0 = -(Cs / TRIALS) / log(P); printf("Initial T: %f\n", T0); @@ -722,7 +722,7 @@ while (1) { double Cprime; pt = createPerturbation(&Selected, T); - doPerturb(&pt, false); + doPerturb(&pt, pcb_false); Cprime = ComputeCost(Nets, T0, T); if (Cprime < C0) { /* good move! */ C0 = Cprime; @@ -735,7 +735,7 @@ steps++; } else - doPerturb(&pt, true); /* undo last change */ + doPerturb(&pt, pcb_true); /* undo last change */ moves++; /* are we at the end of a stage? */ if (good_moves >= good_move_cutoff || moves >= move_cutoff) { @@ -754,8 +754,8 @@ } done: if (changed) { - DeleteRats(false); - AddAllRats(false, NULL); + DeleteRats(pcb_false); + AddAllRats(pcb_false, NULL); Redraw(); } FreePointerListMemory(&Selected); Index: trunk/src_plugins/autoplace/autoplace.h =================================================================== --- trunk/src_plugins/autoplace/autoplace.h (revision 3382) +++ trunk/src_plugins/autoplace/autoplace.h (revision 3383) @@ -35,6 +35,6 @@ #include "global.h" -bool AutoPlaceSelected(void); +pcb_bool AutoPlaceSelected(void); #endif Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 3382) +++ trunk/src_plugins/autoroute/action.c (revision 3383) @@ -69,12 +69,12 @@ hid_action("Busy"); if (function) { /* one parameter */ if (strcmp(function, "AllRats") == 0) { - if (AutoRoute(false)) - SetChangedFlag(true); + if (AutoRoute(pcb_false)) + SetChangedFlag(pcb_true); } else if ((strcmp(function, "SelectedRats") == 0) || (strcmp(function, "Selected") == 0)) { - if (AutoRoute(true)) - SetChangedFlag(true); + if (AutoRoute(pcb_true)) + SetChangedFlag(pcb_true); } } return 0; Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 3382) +++ trunk/src_plugins/autoroute/autoroute.c (revision 3383) @@ -350,16 +350,16 @@ /* maximum conflict incidence before calling it "no path found" */ int hi_conflict; /* are vias allowed? */ - bool use_vias; + pcb_bool use_vias; /* is this an odd or even pass? */ - bool is_odd; + pcb_bool is_odd; /* permit conflicts? */ - bool with_conflicts; + pcb_bool with_conflicts; /* is this a final "smoothing" pass? */ - bool is_smoothing; + pcb_bool is_smoothing; /* rip up nets regardless of conflicts? */ - bool rip_always; - bool last_smooth; + pcb_bool rip_always; + pcb_bool last_smooth; unsigned char pass; } AutoRouteParameters; @@ -376,7 +376,7 @@ * some local prototypes */ static routebox_t *CreateExpansionArea(const BoxType * area, Cardinal group, - routebox_t * parent, bool relax_edge_requirements, edge_t * edge); + routebox_t * parent, pcb_bool relax_edge_requirements, edge_t * edge); static cost_t edge_cost(const edge_t * e, const cost_t too_big); static void best_path_candidate(struct routeone_state *s, edge_t * e, routebox_t * best_target); @@ -386,7 +386,7 @@ static void add_or_destroy_edge(struct routeone_state *s, edge_t * e); static void -RD_DrawThermal(routedata_t * rd, Coord X, Coord Y, Cardinal group, Cardinal layer, routebox_t * subnet, bool is_bad); +RD_DrawThermal(routedata_t * rd, Coord X, Coord Y, Cardinal group, Cardinal layer, routebox_t * subnet, pcb_bool is_bad); static void ResetSubnet(routebox_t * net); #ifdef ROUTE_DEBUG static int showboxen = -2; @@ -399,9 +399,9 @@ */ /* group number of groups that hold surface mount pads */ static Cardinal front, back; -static bool usedGroup[MAX_LAYER]; +static pcb_bool usedGroup[MAX_LAYER]; static int x_cost[MAX_LAYER], y_cost[MAX_LAYER]; -static bool is_layer_group_active[MAX_LAYER]; +static pcb_bool is_layer_group_active[MAX_LAYER]; static int ro = 0; static int smoothes = 1; static int passes = 12; @@ -571,7 +571,7 @@ return closest_point_in_box(from, &rb->sbox); } -static inline bool point_in_shrunk_box(const routebox_t * box, Coord X, Coord Y) +static inline pcb_bool point_in_shrunk_box(const routebox_t * box, Coord X, Coord Y) { BoxType b = shrink_routebox(box); return point_in_box(&b, X, Y); @@ -581,7 +581,7 @@ * routedata initialization functions. */ -static routebox_t *AddPin(PointerListType layergroupboxes[], PinTypePtr pin, bool is_via, RouteStyleType * style) +static routebox_t *AddPin(PointerListType layergroupboxes[], PinTypePtr pin, pcb_bool is_via, RouteStyleType * style) { routebox_t **rbpp, *lastrb = NULL; int i, ht; @@ -861,11 +861,11 @@ /* layer must be 1) not silk (ie, < max_copper_layer) and 2) on */ if ((PCB->LayerGroups.Entries[group][i] < max_copper_layer) && PCB->Data->Layer[PCB->LayerGroups.Entries[group][i]].On) { routing_layers++; - is_layer_group_active[group] = true; + is_layer_group_active[group] = pcb_true; break; } else - is_layer_group_active[group] = false; + is_layer_group_active[group] = pcb_false; } /* if via visibility is turned off, don't use them */ AutoRouteParameters.use_vias = routing_layers > 1 && PCB->ViaOn; @@ -918,14 +918,14 @@ GROUP_LOOP(PCB->Data, i); { if (linelist_length(&layer->Line) || arclist_length(&layer->Arc)) - usedGroup[i] = true; + usedGroup[i] = pcb_true; else - usedGroup[i] = false; + usedGroup[i] = pcb_false; } END_LOOP; } - usedGroup[front] = true; - usedGroup[back] = true; + usedGroup[front] = pcb_true; + usedGroup[back] = pcb_true; /* add the objects in the netlist first. * then go and add all other objects that weren't already added * @@ -932,8 +932,8 @@ * this saves on searching the trees to find the nets */ /* use the PCB_FLAG_DRC to mark objects as they are entered */ - ResetConnections(false); - Nets = CollectSubnets(false); + ResetConnections(pcb_false); + Nets = CollectSubnets(pcb_false); { routebox_t *last_net = NULL; NETLIST_LOOP(&Nets); @@ -995,10 +995,10 @@ rb = AddPad(layergroupboxes, (ElementType *) connection->ptr1, (PadType *) connection->ptr2, rd->styles[j]); break; case PCB_TYPE_PIN: - rb = AddPin(layergroupboxes, (PinType *) connection->ptr2, false, rd->styles[j]); + rb = AddPin(layergroupboxes, (PinType *) connection->ptr2, pcb_false, rd->styles[j]); break; case PCB_TYPE_VIA: - rb = AddPin(layergroupboxes, (PinType *) connection->ptr2, true, rd->styles[j]); + rb = AddPin(layergroupboxes, (PinType *) connection->ptr2, pcb_true, rd->styles[j]); break; case PCB_TYPE_POLYGON: rb = @@ -1043,7 +1043,7 @@ if (TEST_FLAG(PCB_FLAG_DRC, pin)) CLEAR_FLAG(PCB_FLAG_DRC, pin); else - AddPin(layergroupboxes, pin, false, rd->styles[rd->max_styles]); + AddPin(layergroupboxes, pin, pcb_false, rd->styles[rd->max_styles]); } ENDALL_LOOP; ALLPAD_LOOP(PCB->Data); @@ -1060,7 +1060,7 @@ if (TEST_FLAG(PCB_FLAG_DRC, via)) CLEAR_FLAG(PCB_FLAG_DRC, via); else - AddPin(layergroupboxes, via, true, rd->styles[rd->max_styles]); + AddPin(layergroupboxes, via, pcb_true, rd->styles[rd->max_styles]); } END_LOOP; @@ -1242,12 +1242,12 @@ } /* get to actual pins/pad target coordinates */ -bool TargetPoint(CheapPointType * nextpoint, const routebox_t * target) +pcb_bool TargetPoint(CheapPointType * nextpoint, const routebox_t * target) { if (target->type == PIN) { nextpoint->X = target->parent.pin->X; nextpoint->Y = target->parent.pin->Y; - return true; + return pcb_true; } else if (target->type == PAD) { if (labs(target->parent.pad->Point1.X - nextpoint->X) < labs(target->parent.pad->Point2.X - nextpoint->X)) @@ -1258,13 +1258,13 @@ nextpoint->Y = target->parent.pad->Point1.Y; else nextpoint->Y = target->parent.pad->Point2.Y; - return true; + return pcb_true; } else { nextpoint->X = CENTER_X(target->sbox); nextpoint->Y = CENTER_Y(target->sbox); } - return false; + return pcb_false; } /* return the *minimum cost* from a point to a route box, including possible @@ -1400,7 +1400,7 @@ return rb; } -static vector_t *path_conflicts(routebox_t * rb, routebox_t * conflictor, bool branch) +static vector_t *path_conflicts(routebox_t * rb, routebox_t * conflictor, pcb_bool branch) { if (branch) rb->conflicts_with = vector_duplicate(rb->conflicts_with); @@ -1602,7 +1602,7 @@ assert(box_is_good(area)); assert(AutoRouteParameters.with_conflicts || (to_site_conflict == NO_CONFLICT && through_site_conflict == NO_CONFLICT)); - rb = CreateExpansionArea(area, group, parent, true, previous_edge); + rb = CreateExpansionArea(area, group, parent, pcb_true, previous_edge); rb->flags.is_via = 1; rb->came_from = ALL; #if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_VIA_BOXES) @@ -1666,8 +1666,8 @@ assert(container->flags.touched == 0); assert(previous_edge->rb->group == container->group); /* use the caller's idea of what this box should be */ - rb = CreateExpansionArea(interior_edge, previous_edge->rb->group, previous_edge->rb, true, previous_edge); - path_conflicts(rb, container, true); /* crucial! */ + rb = CreateExpansionArea(interior_edge, previous_edge->rb->group, previous_edge->rb, pcb_true, previous_edge); + path_conflicts(rb, container, pcb_true); /* crucial! */ costpoint = closest_point_in_box(&previous_edge->cost_point, interior_edge); d = cost_to_point_on_layer(&costpoint, &previous_edge->cost_point, previous_edge->rb->group); d *= cost_penalty_to_box; @@ -1738,7 +1738,7 @@ struct broken_boxes { BoxType left, center, right; - bool is_valid_left, is_valid_center, is_valid_right; + pcb_bool is_valid_left, is_valid_center, is_valid_right; }; static struct broken_boxes break_box_edge(const BoxType * original, direction_t which_edge, routebox_t * breaker) @@ -1797,7 +1797,7 @@ * the last expansion area created, we string these together in a loop * so we can remove them all easily at the end. */ static routebox_t *CreateExpansionArea(const BoxType * area, Cardinal group, - routebox_t * parent, bool relax_edge_requirements, edge_t * src_edge) + routebox_t * parent, pcb_bool relax_edge_requirements, edge_t * src_edge) { routebox_t *rb = (routebox_t *) malloc(sizeof(*rb)); memset((void *) rb, 0, sizeof(*rb)); @@ -1945,7 +1945,7 @@ return R_DIR_FOUND_CONTINUE; } -static bool boink_box(routebox_t * rb, struct E_result *res, direction_t dir) +static pcb_bool boink_box(routebox_t * rb, struct E_result *res, direction_t dir) { Coord bloat; if (rb->style->Clearance > res->keep) @@ -1958,18 +1958,18 @@ case NORTH: case SOUTH: if (rb->sbox.X2 <= res->inflated.X1 + bloat || rb->sbox.X1 >= res->inflated.X2 - bloat) - return false; - return true; + return pcb_false; + return pcb_true; case EAST: case WEST: if (rb->sbox.Y1 >= res->inflated.Y2 - bloat || rb->sbox.Y2 <= res->inflated.Y1 + bloat) - return false; - return true; + return pcb_false; + return pcb_true; break; default: assert(0); } - return false; + return pcb_false; } /* main Expand routine. @@ -2313,7 +2313,7 @@ vector_append(area_vec, nrb); nrb->flags.homeless = 0; /* not homeless any more */ /* mark this one as conflicted */ - path_conflicts(nrb, blocker, true); + path_conflicts(nrb, blocker, pcb_true); /* and make an expansion edge */ nrb->cost_point = closest_point_in_box(&nrb->cost_point, &blocker->sbox); nrb->cost += @@ -2378,7 +2378,7 @@ routebox_t *parent; BoxType box; direction_t dir; - bool ignore_source; + pcb_bool ignore_source; }; static r_dir_t __GatherBlockers(const BoxType * box, void *cl) @@ -2824,7 +2824,7 @@ * Route-tracing code: once we've got a path of expansion boxes, trace * a line through them to actually create the connection. */ -static void RD_DrawThermal(routedata_t * rd, Coord X, Coord Y, Cardinal group, Cardinal layer, routebox_t * subnet, bool is_bad) +static void RD_DrawThermal(routedata_t * rd, Coord X, Coord Y, Cardinal group, Cardinal layer, routebox_t * subnet, pcb_bool is_bad) { routebox_t *rb; rb = (routebox_t *) malloc(sizeof(*rb)); @@ -2846,7 +2846,7 @@ rb->flags.homeless = 0; } -static void RD_DrawVia(routedata_t * rd, Coord X, Coord Y, Coord radius, routebox_t * subnet, bool is_bad) +static void RD_DrawVia(routedata_t * rd, Coord X, Coord Y, Coord radius, routebox_t * subnet, pcb_bool is_bad) { routebox_t *rb, *first_via = NULL; int i; @@ -2874,7 +2874,7 @@ rb->flags.is_odd = AutoRouteParameters.is_odd; rb->flags.is_bad = is_bad; rb->came_from = ALL; - rb->flags.circular = true; + rb->flags.circular = pcb_true; rb->style = AutoRouteParameters.style; rb->pass = AutoRouteParameters.pass; if (first_via == NULL) { @@ -2903,7 +2903,7 @@ static void RD_DrawLine(routedata_t * rd, Coord X1, Coord Y1, Coord X2, - Coord Y2, Coord halfthick, Cardinal group, routebox_t * subnet, bool is_bad, bool is_45) + Coord Y2, Coord halfthick, Cardinal group, routebox_t * subnet, pcb_bool is_bad, pcb_bool is_45) { /* we hold the line in a queue to concatenate segments that * ajoin one another. That reduces the number of things in @@ -2913,7 +2913,7 @@ static Coord qX1 = -1, qY1, qX2, qY2; static Coord qhthick; static Cardinal qgroup; - static bool qis_45, qis_bad; + static pcb_bool qis_45, qis_bad; static routebox_t *qsn; routebox_t *rb; @@ -2992,7 +2992,7 @@ /* and to the via space structures */ if (AutoRouteParameters.use_vias) mtspace_add(rd->mtspace, &rb->box, rb->flags.is_odd ? ODD : EVEN, rb->style->Clearance); - usedGroup[rb->group] = true; + usedGroup[rb->group] = pcb_true; /* and queue this one */ qX1 = X1; qY1 = Y1; @@ -3005,20 +3005,20 @@ qsn = subnet; } -static bool +static pcb_bool RD_DrawManhattanLine(routedata_t * rd, const BoxType * box1, const BoxType * box2, CheapPointType start, CheapPointType end, - Coord halfthick, Cardinal group, routebox_t * subnet, bool is_bad, bool last_was_x) + Coord halfthick, Cardinal group, routebox_t * subnet, pcb_bool is_bad, pcb_bool last_was_x) { CheapPointType knee = start; if (end.X == start.X) { - RD_DrawLine(rd, start.X, start.Y, end.X, end.Y, halfthick, group, subnet, is_bad, false); - return false; + RD_DrawLine(rd, start.X, start.Y, end.X, end.Y, halfthick, group, subnet, is_bad, pcb_false); + return pcb_false; } else if (end.Y == start.Y) { - RD_DrawLine(rd, start.X, start.Y, end.X, end.Y, halfthick, group, subnet, is_bad, false); - return true; + RD_DrawLine(rd, start.X, start.Y, end.X, end.Y, halfthick, group, subnet, is_bad, pcb_false); + return pcb_true; } /* find where knee belongs */ if (point_in_box(box1, end.X, start.Y) @@ -3040,8 +3040,8 @@ if (1 || !AutoRouteParameters.is_smoothing) { /* draw standard manhattan paths */ - RD_DrawLine(rd, start.X, start.Y, knee.X, knee.Y, halfthick, group, subnet, is_bad, false); - RD_DrawLine(rd, knee.X, knee.Y, end.X, end.Y, halfthick, group, subnet, is_bad, false); + RD_DrawLine(rd, start.X, start.Y, knee.X, knee.Y, halfthick, group, subnet, is_bad, pcb_false); + RD_DrawLine(rd, knee.X, knee.Y, end.X, end.Y, halfthick, group, subnet, is_bad, pcb_false); } else { /* draw 45-degree path across knee */ @@ -3055,9 +3055,9 @@ kneeend.Y += (kneeend.Y > end.Y) ? -len45 : len45; else kneeend.X += (kneeend.X > end.X) ? -len45 : len45; - RD_DrawLine(rd, start.X, start.Y, kneestart.X, kneestart.Y, halfthick, group, subnet, is_bad, false); - RD_DrawLine(rd, kneestart.X, kneestart.Y, kneeend.X, kneeend.Y, halfthick, group, subnet, is_bad, true); - RD_DrawLine(rd, kneeend.X, kneeend.Y, end.X, end.Y, halfthick, group, subnet, is_bad, false); + RD_DrawLine(rd, start.X, start.Y, kneestart.X, kneestart.Y, halfthick, group, subnet, is_bad, pcb_false); + RD_DrawLine(rd, kneestart.X, kneestart.Y, kneeend.X, kneeend.Y, halfthick, group, subnet, is_bad, pcb_true); + RD_DrawLine(rd, kneeend.X, kneeend.Y, end.X, end.Y, halfthick, group, subnet, is_bad, pcb_false); } return (knee.X != end.X); } @@ -3105,9 +3105,9 @@ * as they don't poke more than half thick outside the path box. */ -static void TracePath(routedata_t * rd, routebox_t * path, const routebox_t * target, routebox_t * subnet, bool is_bad) +static void TracePath(routedata_t * rd, routebox_t * path, const routebox_t * target, routebox_t * subnet, pcb_bool is_bad) { - bool last_x = false; + pcb_bool last_x = pcb_false; Coord halfwidth = HALF_THICK(AutoRouteParameters.style->Thick); Coord radius = HALF_THICK(AutoRouteParameters.style->Diameter); CheapPointType lastpoint, nextpoint; @@ -3251,7 +3251,7 @@ } while (!path->flags.source); /* flush the line queue */ - RD_DrawLine(rd, -1, 0, 0, 0, 0, 0, NULL, false, false); + RD_DrawLine(rd, -1, 0, 0, 0, 0, 0, NULL, pcb_false, pcb_false); if (conf_core.editor.live_routing) Draw(); @@ -3265,7 +3265,7 @@ /* create a fake "edge" used to defer via site searching. */ static void CreateSearchEdge(struct routeone_state *s, vetting_t * work, edge_t * parent, - routebox_t * rb, conflict_t conflict, rtree_t * targets, bool in_plane) + routebox_t * rb, conflict_t conflict, rtree_t * targets, pcb_bool in_plane) { routebox_t *target; BoxType b; @@ -3345,7 +3345,7 @@ add_via_sites(struct routeone_state *s, struct routeone_via_site_state *vss, mtspace_t * mtspace, routebox_t * within, - conflict_t within_conflict_level, edge_t * parent_edge, rtree_t * targets, Coord shrink, bool in_plane) + conflict_t within_conflict_level, edge_t * parent_edge, rtree_t * targets, Coord shrink, pcb_bool in_plane) { Coord radius, clearance; vetting_t *work; @@ -3456,14 +3456,14 @@ showboxen = save; } -static bool net_id(routebox_t * rb, long int id) +static pcb_bool net_id(routebox_t * rb, long int id) { routebox_t *p; LIST_LOOP(rb, same_net, p); if (p->flags.source && p->parent.pad->ID == id) - return true; + return pcb_true; END_LOOP; - return false; + return pcb_false; } static void trace_parents(routebox_t * rb) @@ -3517,7 +3517,7 @@ return R_DIR_NOT_FOUND; else { routebox_t *dis = (routebox_t *) cl; - path_conflicts(dis, rb, false); + path_conflicts(dis, rb, pcb_false); touch_conflicts(dis->conflicts_with, 1); } return R_DIR_FOUND_CONTINUE; @@ -3532,10 +3532,10 @@ } struct routeone_status { - bool found_route; + pcb_bool found_route; int route_had_conflicts; cost_t best_route_cost; - bool net_completely_routed; + pcb_bool net_completely_routed; }; @@ -3609,14 +3609,14 @@ LIST_LOOP(from, same_net, p); p->flags.source = p->flags.target = p->flags.nobloat = 0; END_LOOP; - result.found_route = false; - result.net_completely_routed = true; + result.found_route = pcb_false; + result.net_completely_routed = pcb_true; result.best_route_cost = 0; result.route_had_conflicts = 0; return result; } - result.net_completely_routed = false; + result.net_completely_routed = pcb_false; /* okay, there's stuff to route */ assert(!from->flags.target); @@ -3734,7 +3734,7 @@ edge_t *ne; routebox_t *nrb; assert(pin->flags.target); - nrb = CreateExpansionArea(&b, e->rb->group, e->rb, true, e); + nrb = CreateExpansionArea(&b, e->rb->group, e->rb, pcb_true, e); nrb->flags.is_thermal = 1; /* moving through the plane is free */ e->cost_point.X = b.X1; @@ -3748,11 +3748,11 @@ if (AutoRouteParameters.use_vias && e->cost + AutoRouteParameters.ViaCost < s.best_cost) { /* we need a giant thermal */ routebox_t *nrb = CreateExpansionArea(&e->rb->sbox, e->rb->group, e->rb, - true, e); + pcb_true, e); edge_t *ne = CreateEdge2(nrb, e->expand_dir, e, NULL, e->mincost_target); nrb->flags.is_thermal = 1; - add_via_sites(&s, &vss, rd->mtspace, nrb, NO_CONFLICT, ne, targets, e->rb->style->Diameter, true); + add_via_sites(&s, &vss, rd->mtspace, nrb, NO_CONFLICT, ne, targets, e->rb->style->Diameter, pcb_true); } } goto dontexpand; /* planes only connect via thermals */ @@ -3776,7 +3776,7 @@ BoxType b = shrink_routebox(e->rb); /* limit via region to that inside the plane */ clip_box(&b, &intersecting->sbox); - nrb = CreateExpansionArea(&b, e->rb->group, e->rb, true, e); + nrb = CreateExpansionArea(&b, e->rb->group, e->rb, pcb_true, e); nrb->flags.is_thermal = 1; ne = CreateEdge2(nrb, e->expand_dir, e, NULL, intersecting); best_path_candidate(&s, ne, intersecting); @@ -3926,7 +3926,7 @@ if (!box_is_good(&ans->inflated)) goto dontexpand; - nrb = CreateExpansionArea(&ans->inflated, e->rb->group, e->rb, true, e); + nrb = CreateExpansionArea(&ans->inflated, e->rb->group, e->rb, pcb_true, e); r_insert_entry(rd->layergrouptree[nrb->group], &nrb->box, 1); vector_append(area_vec, nrb); nrb->flags.homeless = 0; /* not homeless any more */ @@ -3939,7 +3939,7 @@ /* add in possible via sites in nrb */ if (AutoRouteParameters.use_vias && !e->rb->flags.is_via && e->cost + AutoRouteParameters.ViaCost < s.best_cost) - add_via_sites(&s, &vss, rd->mtspace, nrb, NO_CONFLICT, e, targets, 0, false); + add_via_sites(&s, &vss, rd->mtspace, nrb, NO_CONFLICT, e, targets, 0, pcb_false); goto dontexpand; } dontexpand: @@ -3957,7 +3957,7 @@ #ifdef ROUTE_VERBOSE printf("%d:%d RC %.0f", ro++, seen, s.best_cost); #endif - result.found_route = true; + result.found_route = pcb_true; result.best_route_cost = s.best_cost; /* determine if the best path had conflicts */ result.route_had_conflicts = 0; @@ -3981,7 +3981,7 @@ #ifdef ROUTE_VERBOSE printf(" (too many in fact)"); #endif - result.found_route = false; + result.found_route = pcb_false; } #ifdef ROUTE_VERBOSE printf("\n"); @@ -3992,7 +3992,7 @@ printf("%d:%d NO PATH FOUND.\n", ro++, seen); #endif result.best_route_cost = s.best_cost; - result.found_route = false; + result.found_route = pcb_false; } /* now remove all expansion areas from the r-tree. */ while (!vector_is_empty(area_vec)) { @@ -4017,7 +4017,7 @@ return result; } -static void InitAutoRouteParameters(int pass, RouteStyleType * style, bool with_conflicts, bool is_smoothing, bool lastpass) +static void InitAutoRouteParameters(int pass, RouteStyleType * style, pcb_bool with_conflicts, pcb_bool is_smoothing, pcb_bool lastpass) { int i; /* routing style */ @@ -4056,7 +4056,7 @@ return R_DIR_NOT_FOUND; } -bool no_expansion_boxes(routedata_t * rd) +pcb_bool no_expansion_boxes(routedata_t * rd) { int i; BoxType big; @@ -4066,9 +4066,9 @@ big.Y2 = MAX_COORD; for (i = 0; i < max_group; i++) { if (r_search(rd->layergrouptree[i], &big, NULL, bad_boy, NULL, NULL)) - return false; + return pcb_false; } - return true; + return pcb_true; } #endif @@ -4123,7 +4123,7 @@ { struct routeall_status ras; struct routeone_status ros; - bool rip; + pcb_bool rip; int request_cancel; #ifdef NET_HEAP heap_t *net_heap; @@ -4183,12 +4183,12 @@ if (i > 0) { /* rip up all unfixed traces in this net ? */ if (AutoRouteParameters.rip_always) - rip = true; + rip = pcb_true; else { - rip = false; + rip = pcb_false; LIST_LOOP(net, same_net, p); if (p->flags.is_bad) { - rip = true; + rip = pcb_true; break; } END_LOOP; @@ -4198,7 +4198,7 @@ p->flags.is_bad = 0; if (!p->flags.fixed) { #ifndef NDEBUG - bool del; + pcb_bool del; #endif assert(!p->flags.homeless); if (rip) { @@ -4423,10 +4423,10 @@ /* paths go on first 'on' layer in group */ -/* returns 'true' if any paths were added. */ -bool IronDownAllUnfixedPaths(routedata_t * rd) +/* returns 'pcb_true' if any paths were added. */ +pcb_bool IronDownAllUnfixedPaths(routedata_t * rd) { - bool changed = false; + pcb_bool changed = pcb_false; LayerTypePtr layer; routebox_t *net, *p; int i; @@ -4472,7 +4472,7 @@ if (p->parent.line) { AddObjectToCreateUndoList(PCB_TYPE_LINE, layer, p->parent.line, p->parent.line); - changed = true; + changed = pcb_true; } } else if (p->type == VIA || p->type == VIA_SHADOW) { @@ -4491,7 +4491,7 @@ assert(pp->parent.via); if (pp->parent.via) { AddObjectToCreateUndoList(PCB_TYPE_VIA, pp->parent.via, pp->parent.via, pp->parent.via); - changed = true; + changed = pcb_true; } } assert(pp->parent.via); @@ -4515,13 +4515,13 @@ /* thermals are alread a single point search, no need to shrink */ int type = FindPin(&p->box, &pin); if (pin) { - AddObjectToClearPolyUndoList(type, pin->Element ? pin->Element : pin, pin, pin, false); + AddObjectToClearPolyUndoList(type, pin->Element ? pin->Element : pin, pin, pin, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, LAYER_PTR(p->layer), pin); AddObjectToFlagUndoList(type, pin->Element ? pin->Element : pin, pin, pin); ASSIGN_THERM(p->layer, PCB->ThermStyle, pin); - AddObjectToClearPolyUndoList(type, pin->Element ? pin->Element : pin, pin, pin, true); + AddObjectToClearPolyUndoList(type, pin->Element ? pin->Element : pin, pin, pin, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, LAYER_PTR(p->layer), pin); - changed = true; + changed = pcb_true; } } } @@ -4531,9 +4531,9 @@ return changed; } -bool AutoRoute(bool selected) +pcb_bool AutoRoute(pcb_bool selected) { - bool changed = false; + pcb_bool changed = pcb_false; routedata_t *rd; int i; @@ -4552,11 +4552,11 @@ if (PCB->RouteStyle.array[i].Thick == 0 || PCB->RouteStyle.array[i].Diameter == 0 || PCB->RouteStyle.array[i].Hole == 0 || PCB->RouteStyle.array[i].Clearance == 0) { Message(PCB_MSG_DEFAULT, "You must define proper routing styles\n" "before auto-routing.\n"); - return (false); + return (pcb_false); } } if (ratlist_length(&PCB->Data->Rat) == 0) - return (false); + return (pcb_false); SaveFindFlag(PCB_FLAG_DRC); rd = CreateRouteData(); @@ -4595,7 +4595,7 @@ } */ /* route exactly one net, without allowing conflicts */ - InitAutoRouteParameters(0, a->style, false, true, true); + InitAutoRouteParameters(0, a->style, pcb_false, pcb_true, pcb_true); /* hace planes work better as sources than targets */ changed = RouteOne(rd, a, b, 150000).found_route || changed; goto donerouting; @@ -4643,7 +4643,7 @@ if (!a || !b) { #ifdef DEBUG_STALE_RATS AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); - ASSIGN_FLAG(PCB_FLAG_SELECTED, true, line); + ASSIGN_FLAG(PCB_FLAG_SELECTED, pcb_true, line); DrawRat(line, 0); #endif /* DEBUG_STALE_RATS */ Message(PCB_MSG_DEFAULT, "The rats nest is stale! Aborting autoroute...\n"); @@ -4702,9 +4702,9 @@ SaveUndoSerialNumber(); /* optimize rats, we've changed connectivity a lot. */ - DeleteRats(false /*all rats */ ); + DeleteRats(pcb_false /*all rats */ ); RestoreUndoSerialNumber(); - AddAllRats(false /*all rats */ , NULL); + AddAllRats(pcb_false /*all rats */ , NULL); RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); Index: trunk/src_plugins/autoroute/autoroute.h =================================================================== --- trunk/src_plugins/autoroute/autoroute.h (revision 3382) +++ trunk/src_plugins/autoroute/autoroute.h (revision 3383) @@ -37,6 +37,6 @@ #include "global.h" -bool AutoRoute(bool); +pcb_bool AutoRoute(pcb_bool); #endif Index: trunk/src_plugins/autoroute/mtspace.c =================================================================== --- trunk/src_plugins/autoroute/mtspace.c (revision 3382) +++ trunk/src_plugins/autoroute/mtspace.c (revision 3383) @@ -184,7 +184,7 @@ CheapPointType *desired; Coord radius, clearance; jmp_buf env; - bool touch_is_vec; + pcb_bool touch_is_vec; }; static inline void heap_append(heap_t * heap, CheapPointType * desired, BoxType * newone) @@ -293,11 +293,11 @@ * anything. If a region does intersect something, it is broken into * pieces that don't intersect that thing (if possible) which are * put back into the vector/heap of regions to check. - * qloop returns false when it finds the first empty region - * it returns true if it has exhausted the region vector/heap and never + * qloop returns pcb_false when it finds the first empty region + * it returns pcb_true if it has exhausted the region vector/heap and never * found an empty area. */ -static void qloop(struct query_closure *qc, rtree_t * tree, heap_or_vector res, bool is_vec) +static void qloop(struct query_closure *qc, rtree_t * tree, heap_or_vector res, pcb_bool is_vec) { BoxType *cbox; int n; @@ -376,7 +376,7 @@ vetting_t * work, vector_t * free_space_vec, vector_t * lo_conflict_space_vec, - vector_t * hi_conflict_space_vec, bool is_odd, bool with_conflicts, CheapPointType * desired) + vector_t * hi_conflict_space_vec, pcb_bool is_odd, pcb_bool with_conflicts, CheapPointType * desired) { struct query_closure qc; @@ -433,7 +433,7 @@ */ qc.checking = work->untested; qc.touching.v = NULL; - qloop(&qc, mtspace->ftree, work->no_fix, false); + qloop(&qc, mtspace->ftree, work->no_fix, pcb_false); /* search the hi-conflict tree placing intersectors in the * hi_candidate vector (if conflicts are allowed) and * placing empty regions in the no_hi vector. @@ -440,8 +440,8 @@ */ qc.checking.v = work->no_fix.v; qc.touching.v = with_conflicts ? work->hi_candidate.v : NULL; - qc.touch_is_vec = false; - qloop(&qc, is_odd ? mtspace->otree : mtspace->etree, work->no_hi, false); + qc.touch_is_vec = pcb_false; + qloop(&qc, is_odd ? mtspace->otree : mtspace->etree, work->no_hi, pcb_false); /* search the lo-conflict tree placing intersectors in the * lo-conflict answer vector (if conflicts allowed) and * placing emptry regions in the free-space answer vector. @@ -449,10 +449,10 @@ qc.checking = work->no_hi; /* XXX lo_conflict_space_vec will be treated like a heap! */ qc.touching.v = (with_conflicts ? lo_conflict_space_vec : NULL); - qc.touch_is_vec = true; - qloop(&qc, is_odd ? mtspace->etree : mtspace->otree, temporary, true); + qc.touch_is_vec = pcb_true; + qloop(&qc, is_odd ? mtspace->etree : mtspace->otree, temporary, pcb_true); - /* qloop (&qc, is_odd ? mtspace->etree : mtspace->otree, (heap_or_vector)free_space_vec, true); */ + /* qloop (&qc, is_odd ? mtspace->etree : mtspace->otree, (heap_or_vector)free_space_vec, pcb_true); */ if (!vector_is_empty(free_space_vec)) { if (qc.desired) { if (heap_is_empty(work->untested.h)) @@ -474,10 +474,10 @@ qc.checking = work->hi_candidate; qc.touching.v = NULL; - qloop(&qc, is_odd ? mtspace->etree : mtspace->otree, temporary, true); + qloop(&qc, is_odd ? mtspace->etree : mtspace->otree, temporary, pcb_true); /* qloop (&qc, is_odd ? mtspace->etree : mtspace->otree, */ - /* (heap_or_vector)hi_conflict_space_vec, true); */ + /* (heap_or_vector)hi_conflict_space_vec, pcb_true); */ } } while (!(qc.desired ? heap_is_empty(work->untested.h) : vector_is_empty(work->untested.v))); Index: trunk/src_plugins/autoroute/mtspace.h =================================================================== --- trunk/src_plugins/autoroute/mtspace.h (revision 3382) +++ trunk/src_plugins/autoroute/mtspace.h (revision 3383) @@ -69,7 +69,7 @@ vetting_t * work, vector_t * free_space_vec, vector_t * lo_conflict_space_vec, - vector_t * hi_conflict_space_vec, bool is_odd, bool with_conflicts, CheapPointType * desired); + vector_t * hi_conflict_space_vec, pcb_bool is_odd, pcb_bool with_conflicts, CheapPointType * desired); void mtsFreeWork(vetting_t **); int mtsBoxCount(vetting_t *); Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 3382) +++ trunk/src_plugins/djopt/djopt.c (revision 3383) @@ -2553,7 +2553,7 @@ corner_s *c; #ifdef ENDIF - SwitchDrawingWindow(PCB->Zoom, Output.drawing_area->window, conf_core.editor.show_solder_side, false); + SwitchDrawingWindow(PCB->Zoom, Output.drawing_area->window, conf_core.editor.show_solder_side, pcb_false); #endif hid_action("Busy"); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 3382) +++ trunk/src_plugins/export_gerber/gerber.c (revision 3383) @@ -912,7 +912,7 @@ static void gerber_draw_line(hidGC gc, Coord x1, Coord y1, Coord x2, Coord y2) { - bool m = false; + pcb_bool m = pcb_false; if (x1 != x2 && y1 != y2 && gc->cap == Square_Cap) { Coord x[5], y[5]; @@ -945,12 +945,12 @@ return; if (x1 != lastX) { - m = true; + m = pcb_true; lastX = x1; pcb_fprintf(f, "X%.0mc", gerberX(PCB, lastX)); } if (y1 != lastY) { - m = true; + m = pcb_true; lastY = y1; pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY)); } @@ -975,7 +975,7 @@ static void gerber_draw_arc(hidGC gc, Coord cx, Coord cy, Coord width, Coord height, Angle start_angle, Angle delta_angle) { - bool m = false; + pcb_bool m = pcb_false; double arcStartX, arcStopX, arcStartY, arcStopY; /* we never draw zero-width lines */ @@ -1027,12 +1027,12 @@ arcStopX = cx - width * cos(TO_RADIANS(start_angle + delta_angle)); arcStopY = cy + height * sin(TO_RADIANS(start_angle + delta_angle)); if (arcStartX != lastX) { - m = true; + m = pcb_true; lastX = arcStartX; pcb_fprintf(f, "X%.0mc", gerberX(PCB, lastX)); } if (arcStartY != lastY) { - m = true; + m = pcb_true; lastY = arcStartY; pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY)); } @@ -1082,7 +1082,7 @@ static void gerber_fill_polygon(hidGC gc, int n_coords, Coord * x, Coord * y) { - bool m = false; + pcb_bool m = pcb_false; int i; int firstTime = 1; Coord startX = 0, startY = 0; @@ -1096,12 +1096,12 @@ fprintf(f, "G36*\r\n"); for (i = 0; i < n_coords; i++) { if (x[i] != lastX) { - m = true; + m = pcb_true; lastX = x[i]; pcb_fprintf(f, "X%.0mc", gerberX(PCB, lastX)); } if (y[i] != lastY) { - m = true; + m = pcb_true; lastY = y[i]; pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY)); } @@ -1114,15 +1114,15 @@ } else if (m) fprintf(f, "D01*\r\n"); - m = false; + m = pcb_false; } if (startX != lastX) { - m = true; + m = pcb_true; lastX = startX; pcb_fprintf(f, "X%.0mc", gerberX(PCB, startX)); } if (startY != lastY) { - m = true; + m = pcb_true; lastY = startY; pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY)); } Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 3382) +++ trunk/src_plugins/export_nelma/nelma.c (revision 3383) @@ -240,7 +240,7 @@ static int pin_name_to_xy(LibraryEntryType * pin, Coord * x, Coord * y) { ConnectionType conn; - if (!SeekPad(pin, &conn, false)) + if (!SeekPad(pin, &conn, pcb_false)) return 1; switch (conn.type) { case PCB_TYPE_PIN: Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 3382) +++ trunk/src_plugins/export_png/png.c (revision 3383) @@ -606,7 +606,7 @@ int w, h; int xmax, ymax, dpi; const char *fmt; - bool format_error = false; + pcb_bool format_error = pcb_false; if (color_cache) { free(color_cache); @@ -905,27 +905,27 @@ fmt = filetypes[options[HA_filetype].int_value]; if (fmt == NULL) - format_error = true; + format_error = pcb_true; else if (strcmp(fmt, FMT_gif) == 0) #ifdef HAVE_GDIMAGEGIF gdImageGif(im, f); #else - format_error = true; + format_error = pcb_true; #endif else if (strcmp(fmt, FMT_jpg) == 0) #ifdef HAVE_GDIMAGEJPEG gdImageJpeg(im, f, -1); #else - format_error = true; + format_error = pcb_true; #endif else if (strcmp(fmt, FMT_png) == 0) #ifdef HAVE_GDIMAGEPNG gdImagePng(im, f); #else - format_error = true; + format_error = pcb_true; #endif else - format_error = true; + format_error = pcb_true; if (format_error) fprintf(stderr, "Error: Invalid graphic file format." " This is a bug. Please report it.\n"); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 3382) +++ trunk/src_plugins/export_ps/ps.c (revision 3383) @@ -379,26 +379,26 @@ FILE *f; int pagecount; Coord linewidth; - bool print_group[MAX_LAYER]; - bool print_layer[MAX_LAYER]; + pcb_bool print_group[MAX_LAYER]; + pcb_bool print_layer[MAX_LAYER]; double fade_ratio; - bool multi_file; + pcb_bool multi_file; Coord media_width, media_height, ps_width, ps_height; const char *filename; - bool drill_helper; - bool align_marks; - bool outline; - bool mirror; - bool fillpage; - bool automirror; - bool incolor; - bool doing_toc; + pcb_bool drill_helper; + pcb_bool align_marks; + pcb_bool outline; + pcb_bool mirror; + pcb_bool fillpage; + pcb_bool automirror; + pcb_bool incolor; + pcb_bool doing_toc; Coord bloat; - bool invert; + pcb_bool invert; int media_idx; - bool drillcopper; - bool legend; + pcb_bool drillcopper; + pcb_bool legend; LayerTypePtr outline_layer; @@ -408,11 +408,11 @@ HID_Attr_Val ps_values[NUM_OPTIONS]; - bool is_mask; - bool is_drill; - bool is_assy; - bool is_copper; - bool is_paste; + pcb_bool is_mask; + pcb_bool is_drill; + pcb_bool is_assy; + pcb_bool is_copper; + pcb_bool is_paste; double polygrid; } global; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c (revision 3382) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c (revision 3383) @@ -167,13 +167,13 @@ gpmi_event(h->module, HIDE_use_mask, h, use_it); } -void gpmi_hid_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pad, bool drawHole, bool mask) +void gpmi_hid_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pad, pcb_bool drawHole, pcb_bool mask) { hid_t *h = hid_gpmi_data_get(exporter); gpmi_event(h->module, HIDE_fill_pcb_pv, h, fg_gc, bg_gc, pad, drawHole, mask); } -void gpmi_hid_fill_pcb_pad(hidGC gc, PadType * pad, bool clear, bool mask) +void gpmi_hid_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) { hid_t *h = hid_gpmi_data_get(exporter); gpmi_event(h->module, HIDE_fill_pcb_pad, h, gc, pad, clear, mask); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h (revision 3382) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h (revision 3383) @@ -17,6 +17,6 @@ void gpmi_hid_fill_polygon(hidGC gc, int n_coords, Coord *x, Coord *y); void gpmi_hid_fill_pcb_polygon(hidGC gc, PolygonType *poly, const BoxType *clip_box); void gpmi_hid_fill_rect(hidGC gc, Coord x1, Coord y1, Coord x2, Coord y2); -void gpmi_hid_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pad, bool drawHole, bool mask); -void gpmi_hid_fill_pcb_pad(hidGC gc, PadType * pad, bool clear, bool mask); +void gpmi_hid_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pad, pcb_bool drawHole, pcb_bool mask); +void gpmi_hid_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask); void gpmi_hid_use_mask(int use_it); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 3382) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 3383) @@ -14,7 +14,7 @@ void layout_switch_to_layer(int layer) { layer_check(layer); - ChangeGroupVisibility(layer, true, true); + ChangeGroupVisibility(layer, pcb_true, pcb_true); Redraw(); } Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 3382) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 3383) @@ -259,9 +259,9 @@ void fill_polygon(dctx_t *ctx, int n_ints_, int *x_, int *y_); void fill_pcb_polygon(dctx_t *ctx, PolygonType *poly, const BoxType *clip_box); void thindraw_pcb_polygon(dctx_t *ctx, PolygonType *poly, const BoxType *clip_box); -void fill_pcb_pad(dctx_t *ctx, PadType *pad, bool clip, bool mask); -void thindraw_pcb_pad(dctx_t *ctx, PadType *pad, bool clip, bool mask); -void fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pv, bool drawHole, bool mask); -void thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pv, bool drawHole, bool mask); +void fill_pcb_pad(dctx_t *ctx, PadType *pad, pcb_bool clip, pcb_bool mask); +void thindraw_pcb_pad(dctx_t *ctx, PadType *pad, pcb_bool clip, pcb_bool mask); +void fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pv, pcb_bool drawHole, pcb_bool mask); +void thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pv, pcb_bool drawHole, pcb_bool mask); void fill_rect(dctx_t *ctx, int x1_, int y1_, int x2_, int y2_); */ Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 3382) +++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 3383) @@ -28,7 +28,7 @@ GdkGC *mask_gc; GdkGC *u_gc; GdkGC *grid_gc; - bool clip; + pcb_bool clip; GdkRectangle clip_rect; int attached_invalidate_depth; int mark_invalidate_depth; @@ -36,7 +36,7 @@ /* Feature for leading the user to a particular location */ guint lead_user_timeout; GTimer *lead_user_timer; - bool lead_user; + pcb_bool lead_user; Coord lead_user_radius; Coord lead_user_x; Coord lead_user_y; @@ -647,7 +647,7 @@ if (rect != NULL) { priv->clip_rect = *rect; - priv->clip = true; + priv->clip = pcb_true; } else { priv->clip_rect.x = 0; @@ -654,7 +654,7 @@ priv->clip_rect.y = 0; priv->clip_rect.width = gport->width; priv->clip_rect.height = gport->height; - priv->clip = false; + priv->clip = pcb_false; } set_clip(priv, priv->bg_gc); @@ -721,7 +721,7 @@ draw_lead_user(priv); - priv->clip = false; + priv->clip = pcb_false; /* Rest the clip for bg_gc, as it is used outside this function */ gdk_gc_set_clip_mask(priv->bg_gc, NULL); @@ -759,7 +759,7 @@ ghid_screen_update(); } -void ghid_notify_crosshair_change(bool changes_complete) +void ghid_notify_crosshair_change(pcb_bool changes_complete) { render_priv *priv = gport->render_priv; @@ -772,7 +772,7 @@ if (priv->attached_invalidate_depth < 0) { priv->attached_invalidate_depth = 0; - /* A mismatch of changes_complete == false and == true notifications + /* A mismatch of changes_complete == pcb_false and == pcb_true notifications * is not expected to occur, but we will try to handle it gracefully. * As we know the crosshair will have been shown already, we must * repaint the entire view to be sure not to leave an artaefact. @@ -793,7 +793,7 @@ } } -void ghid_notify_mark_change(bool changes_complete) +void ghid_notify_mark_change(pcb_bool changes_complete) { render_priv *priv = gport->render_priv; @@ -806,7 +806,7 @@ if (priv->mark_invalidate_depth < 0) { priv->mark_invalidate_depth = 0; - /* A mismatch of changes_complete == false and == true notifications + /* A mismatch of changes_complete == pcb_false and == pcb_true notifications * is not expected to occur, but we will try to handle it gracefully. * As we know the mark will have been shown already, we must * repaint the entire view to be sure not to leave an artaefact. @@ -1147,20 +1147,20 @@ */ } -bool ghid_event_to_pcb_coords(int event_x, int event_y, Coord * pcb_x, Coord * pcb_y) +pcb_bool ghid_event_to_pcb_coords(int event_x, int event_y, Coord * pcb_x, Coord * pcb_y) { *pcb_x = EVENT_TO_PCB_X(event_x); *pcb_y = EVENT_TO_PCB_Y(event_y); - return true; + return pcb_true; } -bool ghid_pcb_to_event_coords(Coord pcb_x, Coord pcb_y, int *event_x, int *event_y) +pcb_bool ghid_pcb_to_event_coords(Coord pcb_x, Coord pcb_y, int *event_x, int *event_y) { *event_x = DRAW_X(pcb_x); *event_y = DRAW_Y(pcb_y); - return true; + return pcb_true; } @@ -1244,7 +1244,7 @@ ghid_cancel_lead_user(); - priv->lead_user = true; + priv->lead_user = pcb_true; priv->lead_user_x = x; priv->lead_user_y = y; priv->lead_user_radius = PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS); @@ -1267,5 +1267,5 @@ priv->lead_user_timeout = 0; priv->lead_user_timer = NULL; - priv->lead_user = false; + priv->lead_user = pcb_false; } Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 3382) +++ trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 3383) @@ -121,7 +121,7 @@ start_subcomposite(); if (idx >= 0 && idx < max_copper_layer + 2) { - priv->trans_lines = true; + priv->trans_lines = pcb_true; return PCB->Data->Layer[idx].On; } if (idx < 0) { @@ -133,7 +133,7 @@ return TEST_FLAG(SHOWMASKFLAG, PCB); return 0; case SL_SILK: - priv->trans_lines = true; + priv->trans_lines = pcb_true; if (SL_MYSIDE(idx)) return PCB->ElementOn; return 0; @@ -144,7 +144,7 @@ return 1; case SL_RATS: if (PCB->RatOn) - priv->trans_lines = true; + priv->trans_lines = pcb_true; return PCB->RatOn; } } @@ -749,7 +749,7 @@ if (!gdk_gl_drawable_gl_begin(pGlDrawable, pGlContext)) return FALSE; - port->render_priv->in_context = true; + port->render_priv->in_context = pcb_true; return TRUE; } @@ -764,7 +764,7 @@ else glFlush(); - port->render_priv->in_context = false; + port->render_priv->in_context = pcb_false; /* end drawing to current GL-context */ gdk_gl_drawable_gl_end(pGlDrawable); @@ -924,7 +924,7 @@ if (!gdk_gl_drawable_gl_begin(pGlDrawable, pGlContext)) { return FALSE; } - gport->render_priv->in_context = true; + gport->render_priv->in_context = pcb_true; glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -966,7 +966,7 @@ glFlush(); /* end drawing to current GL-context */ - gport->render_priv->in_context = false; + gport->render_priv->in_context = pcb_false; gdk_gl_drawable_gl_end(pGlDrawable); gport->view = save_view; @@ -1018,7 +1018,7 @@ if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) { return NULL; } - gport->render_priv->in_context = true; + gport->render_priv->in_context = pcb_true; glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -1067,7 +1067,7 @@ glFlush(); /* end drawing to current GL-context */ - gport->render_priv->in_context = false; + gport->render_priv->in_context = pcb_false; gdk_gl_drawable_gl_end(gldrawable); gdk_pixmap_unset_gl_capability(pixmap); @@ -1142,7 +1142,7 @@ *pcb_x = EVENT_TO_PCB_X(event_x); *pcb_y = EVENT_TO_PCB_Y(event_y); - return true; + return pcb_true; } bool ghid_pcb_to_event_coords(Coord pcb_x, Coord pcb_y, int *event_x, int *event_y) @@ -1150,7 +1150,7 @@ *event_x = DRAW_X(pcb_x); *event_y = DRAW_Y(pcb_y); - return true; + return pcb_true; } @@ -1222,7 +1222,7 @@ ghid_cancel_lead_user(); - priv->lead_user = true; + priv->lead_user = pcb_true; priv->lead_user_x = x; priv->lead_user_y = y; priv->lead_user_radius = PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS); @@ -1245,5 +1245,5 @@ priv->lead_user_timeout = 0; priv->lead_user_timer = NULL; - priv->lead_user = false; + priv->lead_user = pcb_false; } Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 3382) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 3383) @@ -136,7 +136,7 @@ ghid_zoom_view_abs(SIDE_X(0), SIDE_Y(0), MAX(PCB->MaxWidth / gport->width, PCB->MaxHeight / gport->height)); } -static void ghid_flip_view(Coord center_x, Coord center_y, bool flip_x, bool flip_y) +static void ghid_flip_view(Coord center_x, Coord center_y, pcb_bool flip_x, pcb_bool flip_y) { int widget_x, widget_y; @@ -687,9 +687,9 @@ pd->progress = gtk_progress_bar_new(); gtk_widget_set_size_request(pd->progress, -1, 26); - vbox = gtk_vbox_new(false, 0); - gtk_box_pack_start(GTK_BOX(vbox), pd->message, true, true, 8); - gtk_box_pack_start(GTK_BOX(vbox), pd->progress, false, true, 8); + vbox = gtk_vbox_new(pcb_false, 0); + gtk_box_pack_start(GTK_BOX(vbox), pd->message, pcb_true, pcb_true, 8); + gtk_box_pack_start(GTK_BOX(vbox), pd->progress, pcb_false, pcb_true, 8); alignment = gtk_alignment_new(0., 0., 1., 1.); gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 8, 8, 8, 8); @@ -696,7 +696,7 @@ gtk_container_add(GTK_CONTAINER(alignment), vbox); content_area = gtk_dialog_get_content_area(GTK_DIALOG(pd->dialog)); - gtk_box_pack_start(GTK_BOX(content_area), alignment, true, true, 0); + gtk_box_pack_start(GTK_BOX(content_area), alignment, pcb_true, pcb_true, 0); gtk_widget_show_all(alignment); @@ -1306,7 +1306,7 @@ is shown. Normally, this action changes which pads and silk layer are drawn as -true silk, and which are drawn as the "invisible" layer. It also +pcb_true silk, and which are drawn as the "invisible" layer. It also determines which solder mask you see. As a special case, if the layer group for the side you're looking at @@ -1323,22 +1323,22 @@ int active_group = GetLayerGroupNumberByNumber(LayerStack[0]); int comp_group = GetLayerGroupNumberByNumber(component_silk_layer); int solder_group = GetLayerGroupNumberByNumber(solder_silk_layer); - bool comp_on = LAYER_PTR(PCB->LayerGroups.Entries[comp_group][0])->On; - bool solder_on = LAYER_PTR(PCB->LayerGroups.Entries[solder_group][0])->On; + pcb_bool comp_on = LAYER_PTR(PCB->LayerGroups.Entries[comp_group][0])->On; + pcb_bool solder_on = LAYER_PTR(PCB->LayerGroups.Entries[solder_group][0])->On; if (argc > 0) { switch (argv[0][0]) { case 'h': case 'H': - ghid_flip_view(gport->pcb_x, gport->pcb_y, true, false); + ghid_flip_view(gport->pcb_x, gport->pcb_y, pcb_true, pcb_false); break; case 'v': case 'V': - ghid_flip_view(gport->pcb_x, gport->pcb_y, false, true); + ghid_flip_view(gport->pcb_x, gport->pcb_y, pcb_false, pcb_true); break; case 'r': case 'R': - ghid_flip_view(gport->pcb_x, gport->pcb_y, true, true); + ghid_flip_view(gport->pcb_x, gport->pcb_y, pcb_true, pcb_true); conf_toggle_editor(show_solder_side); /* Swapped back below */ break; default: @@ -1349,7 +1349,7 @@ conf_toggle_editor(show_solder_side); if ((active_group == comp_group && comp_on && !solder_on) || (active_group == solder_group && solder_on && !comp_on)) { - bool new_solder_vis = conf_core.editor.show_solder_side; + pcb_bool new_solder_vis = conf_core.editor.show_solder_side; ChangeGroupVisibility(PCB->LayerGroups.Entries[comp_group][0], !new_solder_vis, !new_solder_vis); ChangeGroupVisibility(PCB->LayerGroups.Entries[solder_group][0], new_solder_vis, new_solder_vis); Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 3382) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 3383) @@ -88,7 +88,7 @@ AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); CLEAR_FLAG(flag, via); DrawVia(via); - change = true; + change = pcb_true; } } END_LOOP; @@ -100,7 +100,7 @@ AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); CLEAR_FLAG(flag, pin); DrawPin(pin); - change = true; + change = pcb_true; } } END_LOOP; @@ -110,7 +110,7 @@ AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); CLEAR_FLAG(flag, pad); DrawPad(pad); - change = true; + change = pcb_true; } } END_LOOP; @@ -122,7 +122,7 @@ AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); CLEAR_FLAG(flag, line); DrawRat(line); - change = true; + change = pcb_true; } } END_LOOP; @@ -132,7 +132,7 @@ AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line); CLEAR_FLAG(flag, line); DrawLine(layer, line); - change = true; + change = pcb_true; } } ENDALL_LOOP; @@ -142,7 +142,7 @@ AddObjectToFlagUndoList(PCB_TYPE_ARC, layer, arc, arc); CLEAR_FLAG(flag, arc); DrawArc(layer, arc); - change = true; + change = pcb_true; } } ENDALL_LOOP; @@ -152,12 +152,12 @@ AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); CLEAR_FLAG(flag, polygon); DrawPolygon(layer, polygon); - change = true; + change = pcb_true; } } ENDALL_LOOP; if (change) { - SetChangedFlag(true); + SetChangedFlag(pcb_true); if (AndDraw) { IncrementUndoSerialNumber(); Draw(); @@ -173,7 +173,7 @@ int i; if (!gtk_tree_selection_get_selected(selection, &model, &iter)) { - unset_found_flags(true); + unset_found_flags(pcb_true); return; } @@ -183,7 +183,7 @@ gtk_tree_model_get(model, &iter, DRC_VIOLATION_OBJ_COL, &violation, -1); - unset_found_flags(false); + unset_found_flags(pcb_false); if (violation == NULL) return; @@ -206,11 +206,11 @@ case PCB_TYPE_LINE: case PCB_TYPE_ARC: case PCB_TYPE_POLYGON: - ChangeGroupVisibility(GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1), true, true); + ChangeGroupVisibility(GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1), pcb_true, pcb_true); } DrawObject(object_type, ptr1, ptr2); } - SetChangedFlag(true); + SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); Draw(); } Index: trunk/src_plugins/hid_gtk/gui-drc-window.h =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.h (revision 3382) +++ trunk/src_plugins/hid_gtk/gui-drc-window.h (revision 3383) @@ -50,7 +50,7 @@ Coord x_coord; Coord y_coord; Angle angle; - bool have_measured; + pcb_bool have_measured; Coord measured_value; Coord required_value; int object_count; Index: trunk/src_plugins/hid_gtk/gui-misc.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-misc.c (revision 3382) +++ trunk/src_plugins/hid_gtk/gui-misc.c (revision 3383) @@ -270,7 +270,7 @@ ask for coord if the scrollwheel triggered the event, it may cause strange GUI lockups when done outside of the drawing area */ if ((getting_loc) || (ghid_wheel_zoom)) - return false; + return pcb_false; getting_loc = 1; ghid_status_line_set_text(message); @@ -278,12 +278,12 @@ oldObjState = Crosshair.AttachedObject.State; oldLineState = Crosshair.AttachedLine.State; oldBoxState = Crosshair.AttachedBox.State; - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); Crosshair.AttachedObject.State = STATE_FIRST; Crosshair.AttachedLine.State = STATE_FIRST; Crosshair.AttachedBox.State = STATE_FIRST; ghid_hand_cursor(); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); /* Stop the top level GMainLoop from getting user input from keyboard | and mouse so we can install our own handlers here. Also set the @@ -309,11 +309,11 @@ ghid_interface_input_signals_connect(); /* return to normal */ ghid_interface_set_sensitive(TRUE); - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); Crosshair.AttachedObject.State = oldObjState; Crosshair.AttachedLine.State = oldLineState; Crosshair.AttachedBox.State = oldBoxState; - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); ghid_restore_cursor(); ghid_set_status_line_label(); Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 3382) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 3383) @@ -202,7 +202,7 @@ { ConnectionType conn; - if (!SeekPad(entry, &conn, false)) + if (!SeekPad(entry, &conn, pcb_false)) return; AddObjectToFlagUndoList(conn.type, conn.ptr1, conn.ptr2, conn.ptr2); @@ -266,7 +266,7 @@ IncrementUndoSerialNumber(); /* And lead the user to the location */ - if (SeekPad(node, &conn, false)) + if (SeekPad(node, &conn, pcb_false)) switch (conn.type) { case PCB_TYPE_PIN: { @@ -504,14 +504,14 @@ node_selected_net = NULL; InitConnectionLookup(); - ResetConnections(true); + ResetConnections(pcb_true); for (i = selected_net->EntryN, entry = selected_net->Entry; i; i--, entry++) - if (SeekPad(entry, &conn, false)) - RatFindHook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, true, true); + if (SeekPad(entry, &conn, pcb_false)) + RatFindHook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, pcb_true, pcb_true); SelectConnection(select_flag); - ResetConnections(false); + ResetConnections(pcb_false); FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); Draw(); @@ -564,7 +564,7 @@ LibraryEntryType *ret_val; LibraryMenuType *node_net; const gchar *node_name; - bool found; + pcb_bool found; } node_get_node_from_name_state; static gboolean node_get_node_from_name_helper(GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer data) Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 3382) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 3383) @@ -99,7 +99,7 @@ #include "hid_flags.h" #include "route_style.h" -static bool ignore_layer_update; +static pcb_bool ignore_layer_update; static GtkWidget *ghid_load_menus(void); @@ -227,7 +227,7 @@ gtk_widget_show_all(ghidgui->info_bar); } -static bool check_externally_modified(void) +static pcb_bool check_externally_modified(void) { GFile *file; GFileInfo *info; @@ -235,7 +235,7 @@ /* Treat zero time as a flag to indicate we've not got an mtime yet */ if (PCB->Filename == NULL || (ghidgui->our_mtime.tv_sec == 0 && ghidgui->our_mtime.tv_usec == 0)) - return false; + return pcb_false; file = g_file_new_for_path(PCB->Filename); info = g_file_query_info(file, G_FILE_ATTRIBUTE_TIME_MODIFIED, G_FILE_QUERY_INFO_NONE, NULL, NULL); @@ -242,7 +242,7 @@ g_object_unref(file); if (info == NULL || !g_file_info_has_attribute(info, G_FILE_ATTRIBUTE_TIME_MODIFIED)) - return false; + return pcb_false; g_file_info_get_modification_time(info, &timeval); /*&ghidgui->last_seen_mtime); */ g_object_unref(info); @@ -249,7 +249,7 @@ /* Ignore when the file on disk is the same age as when we last looked */ if (timeval.tv_sec == ghidgui->last_seen_mtime.tv_sec && timeval.tv_usec == ghidgui->last_seen_mtime.tv_usec) - return false; + return pcb_false; ghidgui->last_seen_mtime = timeval; @@ -337,7 +337,7 @@ update_board_mtime_from_disk(); } -void ghid_notify_save_pcb(const char *filename, bool done) +void ghid_notify_save_pcb(const char *filename, pcb_bool done) { /* Do nothing if it is not the active PCB file that is being saved. */ @@ -425,22 +425,22 @@ /*! \brief Callback for GHidLayerSelector layer selection */ static void layer_selector_select_callback(GHidLayerSelector * ls, int layer, gpointer d) { - ignore_layer_update = true; + ignore_layer_update = pcb_true; /* Select Layer */ PCB->SilkActive = (layer == LAYER_BUTTON_SILK); PCB->RatDraw = (layer == LAYER_BUTTON_RATS); if (layer == LAYER_BUTTON_SILK) { - PCB->ElementOn = true; + PCB->ElementOn = pcb_true; hid_action("LayersChanged"); } else if (layer == LAYER_BUTTON_RATS) { - PCB->RatOn = true; + PCB->RatOn = pcb_true; hid_action("LayersChanged"); } else if (layer < max_copper_layer) - ChangeGroupVisibility(layer, TRUE, true); + ChangeGroupVisibility(layer, TRUE, pcb_true); - ignore_layer_update = false; + ignore_layer_update = pcb_false; ghid_invalidate_all(); } @@ -453,7 +453,7 @@ layer_process(NULL, NULL, &active, layer); active = !active; - ignore_layer_update = true; + ignore_layer_update = pcb_true; switch (layer) { case LAYER_BUTTON_SILK: PCB->ElementOn = active; @@ -487,7 +487,7 @@ break; default: /* Flip the visibility */ - ChangeGroupVisibility(layer, active, false); + ChangeGroupVisibility(layer, active, pcb_false); redraw = TRUE; break; } @@ -500,7 +500,7 @@ if (!active) ghid_layer_selector_select_next_visible(ls); - ignore_layer_update = false; + ignore_layer_update = pcb_false; if (redraw) ghid_invalidate_all(); Index: trunk/src_plugins/hid_gtk/gui.h =================================================================== --- trunk/src_plugins/hid_gtk/gui.h (revision 3382) +++ trunk/src_plugins/hid_gtk/gui.h (revision 3383) @@ -296,7 +296,7 @@ /* In gui-top-window.c */ void ghid_update_toggle_flags(void); -void ghid_notify_save_pcb(const char *file, bool done); +void ghid_notify_save_pcb(const char *file, pcb_bool done); void ghid_notify_filename_changed(void); void ghid_install_accel_groups(GtkWindow * window, GhidGui * gui); void ghid_remove_accel_groups(GtkWindow * window, GhidGui * gui); @@ -423,8 +423,8 @@ void ghid_fill_rect(hidGC gc, Coord x1, Coord y1, Coord x2, Coord y2); void ghid_invalidate_lr(int left, int right, int top, int bottom); void ghid_invalidate_all(); -void ghid_notify_crosshair_change(bool changes_complete); -void ghid_notify_mark_change(bool changes_complete); +void ghid_notify_crosshair_change(pcb_bool changes_complete); +void ghid_notify_mark_change(pcb_bool changes_complete); void ghid_init_renderer(int *, char ***, GHidPort *); void ghid_shutdown_renderer(GHidPort *); void ghid_init_drawing_widget(GtkWidget * widget, GHidPort *); @@ -437,8 +437,8 @@ HID *ghid_request_debug_draw(void); void ghid_flush_debug_draw(void); void ghid_finish_debug_draw(void); -bool ghid_event_to_pcb_coords(int event_x, int event_y, Coord * pcb_x, Coord * pcb_y); -bool ghid_pcb_to_event_coords(Coord pcb_x, Coord pcb_y, int *event_x, int *event_y); +pcb_bool ghid_event_to_pcb_coords(int event_x, int event_y, Coord * pcb_x, Coord * pcb_y); +pcb_bool ghid_pcb_to_event_coords(Coord pcb_x, Coord pcb_y, int *event_x, int *event_y); void ghid_lead_user_to_location(Coord x, Coord y); void ghid_cancel_lead_user(void); Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 3382) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 3383) @@ -1032,7 +1032,7 @@ static Widget sz_text; static Widget sz_set, sz_reset, sz_units; -static int sz_str2val(Widget w, bool pcbu) +static int sz_str2val(Widget w, pcb_bool pcbu) { char *buf = XmTextGetString(w); if (!pcbu) Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 3382) +++ trunk/src_plugins/hid_lesstif/main.c (revision 3383) @@ -151,26 +151,26 @@ out - the largest value means you are looking at the whole board. */ static double view_zoom = PCB_MIL_TO_COORD(10), prev_view_zoom = PCB_MIL_TO_COORD(10); -static bool autofade = 0; -static bool crosshair_on = true; +static pcb_bool autofade = 0; +static pcb_bool crosshair_on = pcb_true; static void lesstif_begin(void); static void lesstif_end(void); -static void ShowCrosshair(bool show) +static void ShowCrosshair(pcb_bool show) { if (crosshair_on == show) return; - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); if (Marked.status) - notify_mark_change(false); + notify_mark_change(pcb_false); crosshair_on = show; - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); if (Marked.status) - notify_mark_change(true); + notify_mark_change(pcb_true); } /* This is the size of the current PCB work area. */ @@ -537,7 +537,7 @@ is shown. Normally, this action changes which pads and silk layer are drawn as -true silk, and which are drawn as the "invisible" layer. It also +pcb_true silk, and which are drawn as the "invisible" layer. It also determines which solder mask you see. As a special case, if the layer group for the side you're looking at @@ -1255,12 +1255,12 @@ return; } in_move_event = 1; - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); if (panning) Pan(2, e->x, e->y); EventMoveCrosshair(Px(e->x), Py(e->y)); AdjustAttachedObjects(); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); in_move_event = 0; } @@ -1301,7 +1301,7 @@ if (lesstif_button_event(w, e)) return; - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); pressed_button = e->xbutton.button; mods = ((e->xbutton.state & ShiftMask) ? M_Shift : 0) + ((e->xbutton.state & ControlMask) ? M_Ctrl : 0) @@ -1312,7 +1312,7 @@ #endif hid_cfg_mouse_action(&lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; } @@ -1322,7 +1322,7 @@ if (e->xbutton.button != pressed_button) return; lesstif_button_event(w, e); - notify_crosshair_change(false); + notify_crosshair_change(pcb_false); pressed_button = 0; mods = ((e->xbutton.state & ShiftMask) ? M_Shift : 0) + ((e->xbutton.state & ControlMask) ? M_Ctrl : 0) @@ -1333,7 +1333,7 @@ #endif + M_Release; hid_cfg_mouse_action(&lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods); - notify_crosshair_change(true); + notify_crosshair_change(pcb_true); break; } @@ -1363,7 +1363,7 @@ case LeaveNotify: crosshair_in_window = 0; - ShowCrosshair(false); + ShowCrosshair(pcb_false); need_idle_proc(); break; @@ -1371,7 +1371,7 @@ crosshair_in_window = 1; in_move_event = 1; EventMoveCrosshair(Px(e->xcrossing.x), Py(e->xcrossing.y)); - ShowCrosshair(true); + ShowCrosshair(pcb_true); in_move_event = 0; need_idle_proc(); break; @@ -2745,7 +2745,7 @@ lesstif_invalidate_lr(0, PCB->MaxWidth, 0, PCB->MaxHeight); } -static void lesstif_notify_crosshair_change(bool changes_complete) +static void lesstif_notify_crosshair_change(pcb_bool changes_complete) { static int invalidate_depth = 0; Pixmap save_pixmap; @@ -2758,7 +2758,7 @@ if (invalidate_depth < 0) { invalidate_depth = 0; - /* A mismatch of changes_complete == false and == true notifications + /* A mismatch of changes_complete == pcb_false and == pcb_true notifications * is not expected to occur, but we will try to handle it gracefully. * As we know the crosshair will have been shown already, we must * repaint the entire view to be sure not to leave an artaefact. @@ -2778,7 +2778,7 @@ invalidate_depth++; } -static void lesstif_notify_mark_change(bool changes_complete) +static void lesstif_notify_mark_change(pcb_bool changes_complete) { static int invalidate_depth = 0; Pixmap save_pixmap; @@ -2788,7 +2788,7 @@ if (invalidate_depth < 0) { invalidate_depth = 0; - /* A mismatch of changes_complete == false and == true notifications + /* A mismatch of changes_complete == pcb_false and == pcb_true notifications * is not expected to occur, but we will try to handle it gracefully. * As we know the mark will have been shown already, we must * repaint the entire view to be sure not to leave an artaefact. @@ -3608,11 +3608,11 @@ } -static bool progress_cancelled = false; +static pcb_bool progress_cancelled = pcb_false; static void progress_cancel_callback(Widget w, void *v, void *cbs) { - progress_cancelled = true; + progress_cancelled = pcb_true; } static Widget progress_dialog = 0; @@ -3651,7 +3651,7 @@ stdarg(XmNvalue, 0); stdarg(XmNmaximum, total > 0 ? total : 1); stdarg(XmNorientation, XmHORIZONTAL); - stdarg(XmNshowArrows, false); + stdarg(XmNshowArrows, pcb_false); progress_scale = XmCreateScrollBar(progress_dialog, XmStrCast("scale"), stdarg_args, stdarg_n); XtManageChild(progress_scale); @@ -3677,7 +3677,7 @@ static int lesstif_progress(int so_far, int total, const char *message) { - static bool started = false; + static pcb_bool started = pcb_false; XEvent e; struct timeval time; double time_delta, time_now; @@ -3686,8 +3686,8 @@ if (so_far == 0 && total == 0 && message == NULL) { XtUnmanageChild(progress_dialog); - started = false; - progress_cancelled = false; + started = pcb_false; + progress_cancelled = pcb_false; return retval; } @@ -3704,7 +3704,7 @@ if (!started) { XtManageChild(progress_dialog); - started = true; + started = pcb_true; } /* Dispatch pending events */ Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 3382) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 3383) @@ -116,14 +116,14 @@ int i; InitConnectionLookup(); - ResetConnections(true); + ResetConnections(pcb_true); for (i = net->EntryN, entry = net->Entry; i; i--, entry++) - if (SeekPad(entry, &conn, false)) - RatFindHook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, true, true); + if (SeekPad(entry, &conn, pcb_false)) + RatFindHook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, pcb_true, pcb_true); SelectConnection(select_flag); - ResetConnections(false); + ResetConnections(pcb_false); FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); Draw(); Index: trunk/src_plugins/hid_lesstif/styles.c =================================================================== --- trunk/src_plugins/hid_lesstif/styles.c (revision 3382) +++ trunk/src_plugins/hid_lesstif/styles.c (revision 3383) @@ -244,8 +244,8 @@ } style = PCB->RouteStyle.array + i; SetLineSize(style->Thick); - SetViaSize(style->Diameter, true); - SetViaDrillingHole(style->Hole, true); + SetViaSize(style->Diameter, pcb_true); + SetViaDrillingHole(style->Hole, pcb_true); SetClearanceWidth(style->Clearance); if (style_dialog) { for (j = 0; j < vtroutestyle_len(&PCB->RouteStyle); j++) Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 3382) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 3383) @@ -55,7 +55,7 @@ LibraryMenuTypePtr menu = NULL; LibraryEntryTypePtr entry; int i, j, lines, kind; - bool continued; + pcb_bool continued; int used_popen = 0; if (!filename) @@ -98,7 +98,7 @@ else inputline[len] = '\0'; } - continued = (inputline[len - 1] == '\\') ? true : false; + continued = (inputline[len - 1] == '\\') ? pcb_true : pcb_false; if (continued) inputline[len - 1] = '\0'; lines++; Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 3382) +++ trunk/src_plugins/import_sch/import_sch.c (revision 3383) @@ -426,8 +426,8 @@ return 1; } - DeleteRats(false); - AddAllRats(false, NULL); + DeleteRats(pcb_false); + AddAllRats(pcb_false, NULL); #ifdef DEBUG printf("ActionImport: =========== Leaving ActionImport ============\n"); Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 3382) +++ trunk/src_plugins/io_lihata/read.c (revision 3383) @@ -84,7 +84,7 @@ static int parse_coord(Coord *res, lht_node_t *nd) { double tmp; - bool success; + pcb_bool success; if ((nd == NULL) || (nd->type != LHT_TEXT)) return -1; @@ -101,7 +101,7 @@ static int parse_angle(Angle *res, lht_node_t *nd) { double tmp; - bool success; + pcb_bool success; if ((nd == NULL) || (nd->type != LHT_TEXT)) return -1; @@ -156,7 +156,7 @@ /* Load the boolean value of a text node into res. Return 0 on success */ -static int parse_bool(bool *res, lht_node_t *nd) +static int parse_bool(pcb_bool *res, lht_node_t *nd) { if (nd == NULL) return -1; @@ -222,7 +222,7 @@ lht_node_t *thr; for (n = 0; n < pcb_object_flagbits_len; n++) { if (pcb_object_flagbits[n].object_types & object_type) { - bool b; + pcb_bool b; if ((parse_bool(&b, lht_dom_hash_get(fn, pcb_object_flagbits[n].name)) == 0) && b) SET_FLAG(pcb_object_flagbits[n].mask, &fh); } Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 3382) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 3383) @@ -8,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -161,13 +161,8 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif +extern int yyleng; -extern yy_size_t yyleng; - extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 @@ -188,13 +183,6 @@ if ( yytext[yyl] == '\n' )\ --yylineno;\ }while(0) - #define YY_LINENO_REWIND_TO(dst) \ - do {\ - const char *p;\ - for ( p = yy_cp-1; p >= (dst); --p)\ - if ( *p == '\n' )\ - --yylineno;\ - }while(0) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -212,6 +200,11 @@ #define unput(c) yyunput( c, (yytext_ptr) ) +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -229,7 +222,7 @@ /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -299,8 +292,8 @@ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -328,7 +321,7 @@ YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); void *yyalloc (yy_size_t ); void *yyrealloc (void *,yy_size_t ); @@ -720,7 +713,7 @@ */ static int Parse(FILE *Pipe, const const char *Executable, const char *Path, const char *Filename, const char *Parameter); -#line 724 "lex.yy.c" +#line 717 "lex.yy.c" #define INITIAL 0 @@ -759,7 +752,7 @@ void yyset_out (FILE * out_str ); -yy_size_t yyget_leng (void ); +int yyget_leng (void ); char *yyget_text (void ); @@ -907,6 +900,11 @@ register char *yy_cp, *yy_bp; register int yy_act; +#line 109 "../../src_plugins/io_pcb/parse_l.l" + + +#line 907 "lex.yy.c" + if ( !(yy_init) ) { (yy_init) = 1; @@ -933,12 +931,6 @@ yy_load_buffer_state( ); } - { -#line 109 "../../src_plugins/io_pcb/parse_l.l" - - -#line 941 "lex.yy.c" - while ( 1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -955,7 +947,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -985,7 +977,7 @@ if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { - yy_size_t yyl; + int yyl; for ( yyl = 0; yyl < yyleng; ++yyl ) if ( yytext[yyl] == '\n' ) @@ -1322,7 +1314,7 @@ #line 211 "../../src_plugins/io_pcb/parse_l.l" ECHO; YY_BREAK -#line 1326 "lex.yy.c" +#line 1318 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1453,7 +1445,6 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -1509,7 +1500,7 @@ else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1516,7 +1507,7 @@ { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); @@ -1523,7 +1514,7 @@ if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1554,7 +1545,7 @@ /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + (yy_n_chars), (size_t) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -1649,7 +1640,7 @@ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 221); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } static void yyunput (int c, register char * yy_bp ) @@ -1664,7 +1655,7 @@ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = (yy_n_chars) + 2; + register int number_to_move = (yy_n_chars) + 2; register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = @@ -1717,7 +1708,7 @@ else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1882,6 +1873,10 @@ yyfree((void *) b ); } +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -1994,7 +1989,7 @@ */ static void yyensure_buffer_stack (void) { - yy_size_t num_to_alloc; + int num_to_alloc; if (!(yy_buffer_stack)) { @@ -2091,12 +2086,12 @@ * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -2178,7 +2173,7 @@ /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -2329,7 +2324,7 @@ #define YYTABLES_NAME "yytables" -#line 210 "../../src_plugins/io_pcb/parse_l.l" +#line 211 "../../src_plugins/io_pcb/parse_l.l" @@ -2344,7 +2339,7 @@ char *tmps; size_t l; #ifdef FLEX_SCANNER - static bool firsttime = true; + static pcb_bool firsttime = pcb_true; #endif if (Pipe == NULL) { @@ -2402,7 +2397,7 @@ /* reset parser if not called the first time */ if (!firsttime) yyrestart(yyin); - firsttime = false; + firsttime = pcb_false; #endif /* init linenumber and filename for yyerror() */ @@ -2415,7 +2410,7 @@ * on termination. */ - CreateBeLenient (true); + CreateBeLenient (pcb_true); #if !defined(HAS_ATEXIT) if (PCB && PCB->Data) @@ -2428,7 +2423,7 @@ /* clean up parse buffer */ yy_delete_buffer(YY_CURRENT_BUFFER); - CreateBeLenient (false); + CreateBeLenient (pcb_false); if (Pipe != NULL) return returncode; Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 3382) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 3383) @@ -221,7 +221,7 @@ char *tmps; size_t l; #ifdef FLEX_SCANNER - static bool firsttime = true; + static pcb_bool firsttime = pcb_true; #endif if (Pipe == NULL) { @@ -279,7 +279,7 @@ /* reset parser if not called the first time */ if (!firsttime) yyrestart(yyin); - firsttime = false; + firsttime = pcb_false; #endif /* init linenumber and filename for yyerror() */ @@ -292,7 +292,7 @@ * on termination. */ - CreateBeLenient (true); + CreateBeLenient (pcb_true); #if !defined(HAS_ATEXIT) if (PCB && PCB->Data) @@ -305,7 +305,7 @@ /* clean up parse buffer */ yy_delete_buffer(YY_CURRENT_BUFFER); - CreateBeLenient (false); + CreateBeLenient (pcb_false); if (Pipe != NULL) return returncode; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 3382) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 3383) @@ -125,7 +125,7 @@ static SymbolTypePtr Symbol; static int pin_num; static LibraryMenuTypePtr Menu; -static bool LayerFlag[MAX_LAYER + 2]; +static pcb_bool LayerFlag[MAX_LAYER + 2]; extern char *yytext; /* defined by LEX */ extern PCBTypePtr yyPCB; @@ -1797,7 +1797,7 @@ YYABORT; } for (i = 0; i < MAX_LAYER + 2; i++) - LayerFlag[i] = false; + LayerFlag[i] = pcb_false; yyFont = &yyPCB->Font; yyData = yyPCB->Data; yyData->pcb = yyPCB; @@ -1844,8 +1844,8 @@ case 9: #line 230 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646 */ - { LayerFlag[0] = true; - LayerFlag[1] = true; + { LayerFlag[0] = pcb_true; + LayerFlag[1] = pcb_true; yyData->LayerN = 2; PostLoadElementPCB (); } @@ -1866,7 +1866,7 @@ YYABORT; } for (i = 0; i < MAX_LAYER + 2; i++) - LayerFlag[i] = false; + LayerFlag[i] = pcb_false; yyData->LayerN = 0; } #line 1873 "parse_y.tab.c" /* yacc.c:1646 */ @@ -1883,7 +1883,7 @@ Message(PCB_MSG_ERROR, "illegal fileformat\n"); YYABORT; } - yyFont->Valid = false; + yyFont->Valid = pcb_false; for (i = 0; i <= MAX_FONTPOSITION; i++) free (yyFont->Symbol[i].Line); memset(yyFont->Symbol, 0, sizeof(yyFont->Symbol)); @@ -1894,7 +1894,7 @@ case 15: #line 278 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646 */ { - yyFont->Valid = true; + yyFont->Valid = pcb_true; SetFontInfo(yyFont); } #line 1901 "parse_y.tab.c" /* yacc.c:1646 */ @@ -2224,7 +2224,7 @@ if (Layer->Name != NULL) free((char*)Layer->Name); Layer->Name = (yyvsp[-3].string); /* shouldn't this be strdup()'ed ? */ - LayerFlag[(yyvsp[-4].integer)-1] = true; + LayerFlag[(yyvsp[-4].integer)-1] = pcb_true; if (yyData->LayerN + 2 < (yyvsp[-4].integer)) yyData->LayerN = (yyvsp[-4].integer) - 2; if ((yyvsp[-2].string) != NULL) @@ -2369,7 +2369,7 @@ #line 1156 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646 */ { Cardinal contour, contour_start, contour_end; - bool bad_contour_found = false; + pcb_bool bad_contour_found = pcb_false; /* ignore junk */ for (contour = 0; contour <= Polygon->HoleIndexN; contour++) { @@ -2379,7 +2379,7 @@ Polygon->PointN : Polygon->HoleIndex[contour]; if (contour_end - contour_start < 3) - bad_contour_found = true; + bad_contour_found = pcb_true; } if (bad_contour_found) @@ -2429,7 +2429,7 @@ #line 1285 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, NoFlags(), - (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, NoFlags(), false); + (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, NoFlags(), pcb_false); free ((yyvsp[-6].string)); free ((yyvsp[-5].string)); pin_num = 1; @@ -2449,7 +2449,7 @@ #line 1303 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-9].integer)), - (yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), false); + (yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), pcb_false); free ((yyvsp[-8].string)); free ((yyvsp[-7].string)); pin_num = 1; @@ -2469,7 +2469,7 @@ #line 1321 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-10].integer)), - (yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), false); + (yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), pcb_false); free ((yyvsp[-9].string)); free ((yyvsp[-8].string)); free ((yyvsp[-7].string)); @@ -2491,7 +2491,7 @@ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-12].integer)), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), OU ((yyvsp[-8].measure)) + OU ((yyvsp[-6].measure)), OU ((yyvsp[-7].measure)) + OU ((yyvsp[-5].measure)), - (yyvsp[-4].number), (yyvsp[-3].number), OldFlags((yyvsp[-2].integer)), false); + (yyvsp[-4].number), (yyvsp[-3].number), OldFlags((yyvsp[-2].integer)), pcb_false); yyElement->MarkX = OU ((yyvsp[-8].measure)); yyElement->MarkY = OU ((yyvsp[-7].measure)); free ((yyvsp[-11].string)); @@ -2514,7 +2514,7 @@ { yyElement = CreateNewElement(yyData, yyElement, yyFont, (yyvsp[-12].flagtype), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), NU ((yyvsp[-8].measure)) + NU ((yyvsp[-6].measure)), NU ((yyvsp[-7].measure)) + NU ((yyvsp[-5].measure)), - (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].flagtype), false); + (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].flagtype), pcb_false); yyElement->MarkX = NU ((yyvsp[-8].measure)); yyElement->MarkY = NU ((yyvsp[-7].measure)); free ((yyvsp[-11].string)); @@ -2777,7 +2777,7 @@ yyerror("symbol ID used twice"); YYABORT; } - Symbol->Valid = true; + Symbol->Valid = pcb_true; Symbol->Delta = NU ((yyvsp[-2].measure)); } #line 2784 "parse_y.tab.c" /* yacc.c:1646 */ @@ -2797,7 +2797,7 @@ yyerror("symbol ID used twice"); YYABORT; } - Symbol->Valid = true; + Symbol->Valid = pcb_true; Symbol->Delta = OU ((yyvsp[-2].measure)); } #line 2804 "parse_y.tab.c" /* yacc.c:1646 */ Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 3382) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 3383) @@ -70,7 +70,7 @@ static SymbolTypePtr Symbol; static int pin_num; static LibraryMenuTypePtr Menu; -static bool LayerFlag[MAX_LAYER + 2]; +static pcb_bool LayerFlag[MAX_LAYER + 2]; extern char *yytext; /* defined by LEX */ extern PCBTypePtr yyPCB; @@ -179,7 +179,7 @@ YYABORT; } for (i = 0; i < MAX_LAYER + 2; i++) - LayerFlag[i] = false; + LayerFlag[i] = pcb_false; yyFont = &yyPCB->Font; yyData = yyPCB->Data; yyData->pcb = yyPCB; @@ -227,8 +227,8 @@ | { PreLoadElementPCB (); layer_group_string = NULL; } element - { LayerFlag[0] = true; - LayerFlag[1] = true; + { LayerFlag[0] = pcb_true; + LayerFlag[1] = pcb_true; yyData->LayerN = 2; PostLoadElementPCB (); } @@ -247,7 +247,7 @@ YYABORT; } for (i = 0; i < MAX_LAYER + 2; i++) - LayerFlag[i] = false; + LayerFlag[i] = pcb_false; yyData->LayerN = 0; } pcbdata @@ -269,7 +269,7 @@ Message(PCB_MSG_ERROR, "illegal fileformat\n"); YYABORT; } - yyFont->Valid = false; + yyFont->Valid = pcb_false; for (i = 0; i <= MAX_FONTPOSITION; i++) free (yyFont->Symbol[i].Line); memset(yyFont->Symbol, 0, sizeof(yyFont->Symbol)); @@ -276,7 +276,7 @@ } symbols { - yyFont->Valid = true; + yyFont->Valid = pcb_true; SetFontInfo(yyFont); } ; @@ -883,7 +883,7 @@ if (Layer->Name != NULL) free((char*)Layer->Name); Layer->Name = $4; /* shouldn't this be strdup()'ed ? */ - LayerFlag[$3-1] = true; + LayerFlag[$3-1] = pcb_true; if (yyData->LayerN + 2 < $3) yyData->LayerN = $3 - 2; if ($5 != NULL) @@ -1155,7 +1155,7 @@ polygonholes ')' { Cardinal contour, contour_start, contour_end; - bool bad_contour_found = false; + pcb_bool bad_contour_found = pcb_false; /* ignore junk */ for (contour = 0; contour <= Polygon->HoleIndexN; contour++) { @@ -1165,7 +1165,7 @@ Polygon->PointN : Polygon->HoleIndex[contour]; if (contour_end - contour_start < 3) - bad_contour_found = true; + bad_contour_found = pcb_true; } if (bad_contour_found) @@ -1284,7 +1284,7 @@ : T_ELEMENT '(' STRING STRING measure measure INTEGER ')' '(' { yyElement = CreateNewElement(yyData, yyElement, yyFont, NoFlags(), - $3, $4, NULL, OU ($5), OU ($6), $7, 100, NoFlags(), false); + $3, $4, NULL, OU ($5), OU ($6), $7, 100, NoFlags(), pcb_false); free ($3); free ($4); pin_num = 1; @@ -1302,7 +1302,7 @@ : T_ELEMENT '(' INTEGER STRING STRING measure measure measure measure INTEGER ')' '(' { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags($3), - $4, $5, NULL, OU ($6), OU ($7), IV ($8), IV ($9), OldFlags($10), false); + $4, $5, NULL, OU ($6), OU ($7), IV ($8), IV ($9), OldFlags($10), pcb_false); free ($4); free ($5); pin_num = 1; @@ -1320,7 +1320,7 @@ : T_ELEMENT '(' INTEGER STRING STRING STRING measure measure measure measure INTEGER ')' '(' { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags($3), - $4, $5, $6, OU ($7), OU ($8), IV ($9), IV ($10), OldFlags($11), false); + $4, $5, $6, OU ($7), OU ($8), IV ($9), IV ($10), OldFlags($11), pcb_false); free ($4); free ($5); free ($6); @@ -1341,7 +1341,7 @@ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags($3), $4, $5, $6, OU ($7) + OU ($9), OU ($8) + OU ($10), - $11, $12, OldFlags($13), false); + $11, $12, OldFlags($13), pcb_false); yyElement->MarkX = OU ($7); yyElement->MarkY = OU ($8); free ($4); @@ -1363,7 +1363,7 @@ { yyElement = CreateNewElement(yyData, yyElement, yyFont, $3, $4, $5, $6, NU ($7) + NU ($9), NU ($8) + NU ($10), - $11, $12, $13, false); + $11, $12, $13, pcb_false); yyElement->MarkX = NU ($7); yyElement->MarkY = NU ($8); free ($4); @@ -1755,7 +1755,7 @@ yyerror("symbol ID used twice"); YYABORT; } - Symbol->Valid = true; + Symbol->Valid = pcb_true; Symbol->Delta = NU ($4); } | T_SYMBOL '(' symbolid measure ')' '(' @@ -1771,7 +1771,7 @@ yyerror("symbol ID used twice"); YYABORT; } - Symbol->Valid = true; + Symbol->Valid = pcb_true; Symbol->Delta = OU ($4); } ; Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 3382) +++ trunk/src_plugins/loghid/hid-logger.c (revision 3383) @@ -41,7 +41,7 @@ delegatee_->invalidate_all(); } -static void log_notify_mark_change(bool changes_complete) { +static void log_notify_mark_change(pcb_bool changes_complete) { pcb_fprintf(out_, "notify_mark_change(%s)\n", changes_complete ? "true" : "false"); delegatee_->notify_mark_change(changes_complete); } @@ -144,25 +144,25 @@ delegatee_->thindraw_pcb_polygon(gc, poly, clip_box); } -static void log_fill_pcb_pad(hidGC gc, PadType *pad, bool clip, bool mask) { +static void log_fill_pcb_pad(hidGC gc, PadType *pad, pcb_bool clip, pcb_bool mask) { pcb_fprintf(out_, "fill_pcb_pad(gc, pad->name=%s, clip=%s, mask=%s)\n", pad->Name, clip ? "true" : "false", mask ? "true" : "false"); delegatee_->fill_pcb_pad(gc, pad, clip, mask); } -static void log_thindraw_pcb_pad(hidGC gc, PadType *pad, bool clip, bool mask) { +static void log_thindraw_pcb_pad(hidGC gc, PadType *pad, pcb_bool clip, pcb_bool mask) { pcb_fprintf(out_, "thindraw_pcb_pad(gc, pad->name=%s, clip=%s, mask=%s)\n", pad->Name, clip ? "true" : "false", mask ? "true" : "false"); delegatee_->thindraw_pcb_pad(gc, pad, clip, mask); } -static void log_fill_pcb_pv(hidGC fg, hidGC bg, PinType *pv, bool drawHole, bool mask) { +static void log_fill_pcb_pv(hidGC fg, hidGC bg, PinType *pv, pcb_bool drawHole, pcb_bool mask) { pcb_fprintf(out_, "fill_pcb_pv(fg, bg, (%mm, %mm), draw_hole=%s, mask=%s)\n", pv->X, pv->Y, drawHole ? "true" : "false", mask ? "true" : "false"); delegatee_->fill_pcb_pv(fg, bg, pv, drawHole, mask); } -static void log_thindraw_pcb_pv(hidGC fg, hidGC bg, PinType *pv, bool drawHole, bool mask) { +static void log_thindraw_pcb_pv(hidGC fg, hidGC bg, PinType *pv, pcb_bool drawHole, pcb_bool mask) { pcb_fprintf(out_, "thindraw_pcb_pv(fg, bg, (%mm, %mm), draw_hole=%s, mask=%s)\n", pv->X, pv->Y, drawHole ? "true" : "false", mask ? "true" : "false"); delegatee_->thindraw_pcb_pv(fg, bg, pv, drawHole, mask); Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 3382) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 3383) @@ -152,7 +152,7 @@ old_cb = find_callback; find_callback = proc_short_cb; SaveFindFlag(PCB_FLAG_MINCUT); - LookupConnection(x, y, false, 1, PCB_FLAG_MINCUT); + LookupConnection(x, y, pcb_false, 1, PCB_FLAG_MINCUT); debprintf("- alloced for %d\n", (short_conns_maxid + 1)); lut_by_oid = calloc(sizeof(short_conn_t *), (short_conns_maxid + 1)); @@ -332,8 +332,8 @@ } - ResetFoundLinesAndPolygons(false); - ResetFoundPinsViasAndPads(false); + ResetFoundLinesAndPolygons(pcb_false); + ResetFoundPinsViasAndPads(pcb_false); RestoreFindFlag(); find_callback = old_cb; Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 3382) +++ trunk/src_plugins/puller/puller.c (revision 3383) @@ -205,7 +205,7 @@ return a * d - b * c; } -/* The lines are x1y1-x2y2 and x3y3-x4y4. Returns true if they +/* The lines are x1y1-x2y2 and x3y3-x4y4. Returns pcb_true if they intersect. */ static int intersection_of_lines(int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4, int *xr, int *yr) { @@ -220,7 +220,7 @@ return 1; } -/* Same, for line segments. Returns true if they intersect. For this +/* Same, for line segments. Returns pcb_true if they intersect. For this function, xr and yr may be NULL if you don't need the values. */ static int intersection_of_linesegs(int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4, int *xr, int *yr) { Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 3382) +++ trunk/src_plugins/renumber/renumber.c (revision 3383) @@ -56,7 +56,7 @@ static int ActionRenumber(int argc, const char **argv, Coord x, Coord y) { - bool changed = false; + pcb_bool changed = pcb_false; ElementTypePtr *element_list; ElementTypePtr *locked_element_list; unsigned int i, j, k, cnt, lock_cnt; @@ -74,7 +74,7 @@ char **was, **is, *pin; unsigned int c_cnt = 0, numele; int ok; - bool free_name = false; + pcb_bool free_name = pcb_false; if (argc < 1) { /* @@ -86,7 +86,7 @@ "This file may be used to back annotate the\n" "change to the schematics.\n"), default_file, ".eco", "eco", 0); - free_name = true; + free_name = pcb_true; } else name = argv[0]; @@ -282,7 +282,7 @@ AddObjectToChangeNameUndoList(PCB_TYPE_ELEMENT, NULL, NULL, element_list[i], NAMEONPCB_NAME(element_list[i])); ChangeObjectName(PCB_TYPE_ELEMENT, element_list[i], NULL, NULL, tmps); - changed = true; + changed = pcb_true; /* we don't free tmps in this case because it is used */ } @@ -343,7 +343,7 @@ NetlistChanged(0); IncrementUndoSerialNumber(); - SetChangedFlag(true); + SetChangedFlag(pcb_true); } free(locked_element_list); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 3382) +++ trunk/src_plugins/report/report.c (revision 3383) @@ -511,7 +511,7 @@ /* NB: The third argument here, 'false' ensures LookupConnection * does not add its changes to the undo system. */ - LookupConnection(x, y, false, PCB->Grid, PCB_FLAG_FOUND); + LookupConnection(x, y, pcb_false, PCB->Grid, PCB_FLAG_FOUND); ALLLINE_LOOP(PCB->Data); { @@ -555,7 +555,7 @@ * by resetting the connections with ResetConnections() before * calling Undo() at the end of the procedure. */ - ResetConnections(true); + ResetConnections(pcb_true); IncrementUndoSerialNumber(); for (ni = 0; ni < PCB->NetlistLib[NETLIST_EDITED].MenuN; ni++) { @@ -563,7 +563,7 @@ const char *list_entry = PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Entry[0].ListEntry; char *ename; char *pname; - bool got_one = 0; + pcb_bool got_one = 0; ename = pcb_strdup(list_entry); pname = strchr(ename, '-'); @@ -612,7 +612,7 @@ length = XYtoNetLength(x, y, &found); /* Reset connectors for the next lookup */ - ResetConnections(false); + ResetConnections(pcb_false); pcb_snprintf(buf, sizeof(buf), "%$m*", units_name, length); gui->log("Net %s length %s\n", netname, buf); @@ -619,8 +619,8 @@ } } - ResetConnections(false); - Undo(true); + ResetConnections(pcb_false); + Undo(pcb_true); return 0; } @@ -640,14 +640,14 @@ * by resetting the connections with ResetConnections() before * calling Undo() at the end of the procedure. */ - ResetConnections(true); + ResetConnections(pcb_true); IncrementUndoSerialNumber(); length = XYtoNetLength(x, y, &found); if (!found) { - ResetConnections(false); - Undo(true); + ResetConnections(pcb_false); + Undo(pcb_true); gui->log("No net under cursor.\n"); return 1; } @@ -700,8 +700,8 @@ END_LOOP; got_net_name: - ResetConnections(false); - Undo(true); + ResetConnections(pcb_false); + Undo(pcb_true); { char buf[50]; @@ -760,7 +760,7 @@ continue; } - if (SeekPad(net->Entry, &conn, false)) { + if (SeekPad(net->Entry, &conn, pcb_false)) { switch (conn.type) { case PCB_TYPE_PIN: x = ((PinType *) (conn.ptr2))->X; @@ -794,14 +794,14 @@ * by resetting the connections with ResetConnections() before * calling Undo() when we are finished. */ - ResetConnections(true); + ResetConnections(pcb_true); IncrementUndoSerialNumber(); length = XYtoNetLength(x, y, &found); netname = net->Name + 2; - ResetConnections(false); - Undo(true); + ResetConnections(pcb_false); + Undo(pcb_true); if (!found) { if (net_found) Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 3382) +++ trunk/src_plugins/shand_cmd/command.c (revision 3383) @@ -127,7 +127,7 @@ } if (!PCB->Changed || gui->confirm_dialog("OK to override layout data?", 0)) - LoadPCB(filename, format, true, 0); + LoadPCB(filename, format, pcb_true, 0); return (0); } @@ -158,7 +158,7 @@ break; default: /* usage */ - Message(PCB_MSG_DEFAULT, false, "Usage: le [name]\n loads element data to buffer\n"); + Message(PCB_MSG_DEFAULT, pcb_false, "Usage: le [name]\n loads element data to buffer\n"); return (1); } return (0); @@ -317,7 +317,7 @@ case 0: if (PCB->Filename) { if (SavePCB(PCB->Filename, NULL) == 0) - SetChangedFlag(false); + SetChangedFlag(pcb_false); } else Message(PCB_MSG_DEFAULT, "No filename to save to yet\n"); @@ -325,7 +325,7 @@ case 1: if (SavePCB(argv[0], NULL) == 0) { - SetChangedFlag(false); + SetChangedFlag(pcb_false); free(PCB->Filename); PCB->Filename = pcb_strdup(argv[0]); if (gui->notify_filename_changed != NULL) Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 3382) +++ trunk/src_plugins/stroke/stroke.c (revision 3383) @@ -52,7 +52,7 @@ char msg[255]; unsigned long num; - mid_stroke = false; + mid_stroke = pcb_false; if (stroke_trans(msg)) { num = atoi(msg); switch (num) { @@ -86,7 +86,7 @@ case 147423: case 147523: case 1474123: - Redo(true); + Redo(pcb_true); break; case 148963: case 147863: @@ -151,7 +151,7 @@ static void real_stroke_start(void) { fprintf(stderr, "stroke: MIID!\n"); - mid_stroke = true; + mid_stroke = pcb_true; StrokeBox.X1 = Crosshair.X; StrokeBox.Y1 = Crosshair.Y; } Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 3382) +++ trunk/src_plugins/toporouter/toporouter.c (revision 3383) @@ -2696,8 +2696,8 @@ void import_clusters(toporouter_t * r) { NetListListType nets; - ResetConnections(false); - nets = CollectSubnets(false); + ResetConnections(pcb_false); + nets = CollectSubnets(pcb_false); NETLIST_LOOP(&nets); { if (netlist->NetN > 0) { @@ -8122,9 +8122,9 @@ toporouter_free(r); SaveUndoSerialNumber(); - DeleteRats(false); + DeleteRats(pcb_false); RestoreUndoSerialNumber(); - AddAllRats(false, NULL); + AddAllRats(pcb_false, NULL); RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); Redraw(); Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 3382) +++ trunk/src_plugins/vendordrill/vendor.c (revision 3383) @@ -54,7 +54,7 @@ static void add_to_drills(char *); static void apply_vendor_map(void); static void process_skips(lht_node_t *); -static bool rematch(const char *, const char *); +static pcb_bool rematch(const char *, const char *); static void vendor_free_all(void); /* list of vendor drills and a count of them */ @@ -157,7 +157,7 @@ const char *sval; lht_doc_t *doc; lht_node_t *drlres; - bool free_fname = false; + pcb_bool free_fname = pcb_false; cached_drill = -1; @@ -172,7 +172,7 @@ if (fname == NULL) AFAIL(load_vendor); - free_fname = true; + free_fname = pcb_true; free(default_file); default_file = NULL; @@ -298,7 +298,7 @@ static void apply_vendor_map(void) { int changed, tot; - bool state; + pcb_bool state; state = conf_vendor.plugins.vendor.enable; @@ -319,7 +319,7 @@ if (via->DrillingHole != vendorDrillMap(via->DrillingHole)) { /* only change unlocked vias */ if (!TEST_FLAG(PCB_FLAG_LOCK, via)) { - if (ChangeObject2ndSize(PCB_TYPE_VIA, via, NULL, NULL, vendorDrillMap(via->DrillingHole), true, false)) + if (ChangeObject2ndSize(PCB_TYPE_VIA, via, NULL, NULL, vendorDrillMap(via->DrillingHole), pcb_true, pcb_false)) changed++; else { Message(PCB_MSG_DEFAULT, _ @@ -349,7 +349,7 @@ tot++; if (pin->DrillingHole != vendorDrillMap(pin->DrillingHole)) { if (!TEST_FLAG(PCB_FLAG_LOCK, pin)) { - if (ChangeObject2ndSize(PCB_TYPE_PIN, element, pin, NULL, vendorDrillMap(pin->DrillingHole), true, false)) + if (ChangeObject2ndSize(PCB_TYPE_PIN, element, pin, NULL, vendorDrillMap(pin->DrillingHole), pcb_true, pcb_false)) changed++; else { Message(PCB_MSG_DEFAULT, _ @@ -405,7 +405,7 @@ * file, redraw things, and make sure we can undo. */ if (changed) { - SetChangedFlag(true); + SetChangedFlag(pcb_true); Redraw(); IncrementUndoSerialNumber(); } @@ -565,13 +565,13 @@ } } -bool vendorIsElementMappable(ElementTypePtr element) +pcb_bool vendorIsElementMappable(ElementTypePtr element) { int i; int noskip; if (!conf_vendor.plugins.vendor.enable) - return false; + return pcb_false; noskip = 1; for (i = 0; i < n_refdes; i++) { @@ -608,12 +608,12 @@ } if (noskip) - return true; + return pcb_true; else - return false; + return pcb_false; } -static bool rematch(const char *re, const char *s) +static pcb_bool rematch(const char *re, const char *s) { int result; re_sei_t *regex; @@ -623,7 +623,7 @@ if (re_sei_errno(regex) != 0) { Message(PCB_MSG_DEFAULT, _("regexp error: %s\n"), re_error_str(re_sei_errno(regex))); re_sei_free(regex); - return false; + return pcb_false; } result = re_sei_exec(regex, s); @@ -630,9 +630,9 @@ re_sei_free(regex); if (result != 0) - return true; + return pcb_true; else - return false; + return pcb_false; } static const char *vendor_cookie = "vendor drill mapping"; Index: trunk/src_plugins/vendordrill/vendor.h =================================================================== --- trunk/src_plugins/vendordrill/vendor.h (revision 3382) +++ trunk/src_plugins/vendordrill/vendor.h (revision 3383) @@ -24,6 +24,6 @@ #define PCB_VENDOR_H int vendorDrillMap(int); -bool vendorIsElementMappable(ElementTypePtr); +pcb_bool vendorIsElementMappable(ElementTypePtr); #endif /* __VENDOR_H__ */