Index: trunk/src/macro.h =================================================================== --- trunk/src/macro.h (revision 29291) +++ trunk/src/macro.h (nonexistent) @@ -1,42 +0,0 @@ -/* - * COPYRIGHT - * - * pcb-rnd, interactive printed circuit board design - * (this file is based on PCB, interactive printed circuit board design) - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Contact: - * Project page: http://repo.hu/projects/pcb-rnd - * lead developer: http://repo.hu/projects/pcb-rnd/contact.html - * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") - * - */ - -/* some commonly used macros not related to a special C-file - * the file is included by global.h after const.h */ - -#ifndef PCB_MACRO_H -#define PCB_MACRO_H - -#define PCB_ENTRIES(x) (sizeof((x))/sizeof((x)[0])) -#define PCB_UNKNOWN(a) ((a) && *(a) ? (a) : "(unknown)") -#define PCB_NSTRCMP(a, b) ((a) ? ((b) ? strcmp((a),(b)) : 1) : -1) -#define PCB_EMPTY(a) ((a) ? (a) : "") -#define PCB_EMPTY_STRING_P(a) ((a) ? (a)[0]==0 : 1) -#define PCB_XOR(a,b) (((a) && !(b)) || (!(a) && (b))) - -#endif Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 29291) +++ trunk/src/Makefile.dep (revision 29292) @@ -131,7 +131,7 @@ ../src/librnd/core/funchash.o: ../src/librnd/core/funchash.c \ ../src_3rd/genht/htpi.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h \ funchash_core.h librnd/core/funchash.h funchash_core_list.h \ - librnd/config.h macro.h librnd/core/compat_misc.h funchash_core_list.h + librnd/config.h librnd/core/compat_misc.h funchash_core_list.h ../src/librnd/core/grid.o: ../src/librnd/core/grid.c librnd/config.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h librnd/core/unit.h \ @@ -162,7 +162,7 @@ librnd/core/attrib.h librnd/core/box.h librnd/core/math_helper.h \ librnd/core/misc_util.h librnd/core/unit.h librnd/core/color.h \ ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h librnd/core/compat_misc.h macro.h + ../src_3rd/genvector/genvector_undef.h librnd/core/compat_misc.h ../src/librnd/core/hid_cfg.o: ../src/librnd/core/hid_cfg.c \ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/tree.h \ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ @@ -442,7 +442,7 @@ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h librnd/core/unit.h \ librnd/poly/polyarea.h obj_common.h flag.h librnd/core/globalconst.h \ - librnd/core/attrib.h data_parent.h macro.h librnd/core/box.h \ + librnd/core/attrib.h data_parent.h librnd/core/box.h \ librnd/core/misc_util.h librnd/poly/rtree2_compat.h ../src/librnd/poly/polygon1_gen.o: ../src/librnd/poly/polygon1_gen.c \ librnd/config.h librnd/core/global_typedefs.h librnd/core/pcb_bool.h \ @@ -733,7 +733,7 @@ ../src_3rd/genrtree/genrtree_api.h ht_subc.h ../src_3rd/genht/ht.h \ ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \ - vtpadstack_t.h draw.h layer.h intersect.h macro.h move.h netlist.h \ + vtpadstack_t.h draw.h layer.h intersect.h move.h netlist.h \ remove.h rotate.h librnd/core/rotate.h obj_rat.h obj_term.h \ obj_pstk_inlines.h data.h thermal.h librnd/poly/polygon1_gen.h data_it.h ../src_plugins/autoroute/action.o: ../src_plugins/autoroute/action.c \ @@ -783,7 +783,7 @@ librnd/poly/rtree2_compat.h librnd/poly/rtree.h \ ../src_3rd/genrtree/genrtree_api.h ht_subc.h ../src_3rd/genht/ht.h \ ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h vtpadstack.h \ - obj_pstk_shape.h polygon.h vtpadstack_t.h macro.h \ + obj_pstk_shape.h polygon.h vtpadstack_t.h \ ../src_plugins/autoroute/autoroute.h board.h vtroutestyle.h rats_patch.h \ board.h librnd/core/hidlib.h draw.h find.h librnd/core/heap.h netlist.h \ ../src_plugins/autoroute/mtspace.h ../src_plugins/autoroute/vector.h \ @@ -800,7 +800,7 @@ librnd/poly/rtree2_compat.h ../src_plugins/autoroute/vector.o: ../src_plugins/autoroute/vector.c \ ../config.h librnd/config.h librnd/core/math_helper.h \ - ../src_plugins/autoroute/vector.h macro.h + ../src_plugins/autoroute/vector.h ../src_plugins/cam/cam.o: ../src_plugins/cam/cam.c ../config.h \ librnd/config.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -926,7 +926,7 @@ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h librnd/core/event.h \ ../src_plugins/diag/integrity.h librnd/core/hid_attrib.h \ librnd/core/hid_dad.h librnd/core/compat_misc.h \ - librnd/core/hid_dad_spin.h search.h macro.h plug_footprint.h vtlibrary.h \ + librnd/core/hid_dad_spin.h search.h plug_footprint.h vtlibrary.h \ plug_io.h funchash_core.h librnd/core/funchash.h funchash_core_list.h \ conf_core.h find.h ../src_plugins/diag/diag_conf_fields.h ../src_plugins/diag/diag_conf.o: ../src_plugins/diag/diag_conf.c \ @@ -1440,7 +1440,7 @@ draw.h librnd/core/plugins.h ../src_3rd/puplug/puplug.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \ - ../src_3rd/puplug/error.h macro.h librnd/core/actions.h \ + ../src_3rd/puplug/error.h librnd/core/actions.h \ librnd/core/compat_misc.h ../src_plugins/distaligntext/distaligntext.o: \ ../src_plugins/distaligntext/distaligntext.c ../config.h librnd/config.h \ @@ -1472,7 +1472,7 @@ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/error.h librnd/core/actions.h conf_core.h \ librnd/core/conf.h librnd/core/pcb-printf.h \ - ../src_3rd/liblihata/lihata.h librnd/core/list_conf.h macro.h \ + ../src_3rd/liblihata/lihata.h librnd/core/list_conf.h \ librnd/core/compat_misc.h ../src_plugins/djopt/djopt.o: ../src_plugins/djopt/djopt.c ../config.h \ librnd/config.h conf_core.h librnd/core/conf.h \ @@ -1505,7 +1505,7 @@ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h librnd/core/actions.h \ - ../src_plugins/djopt/djopt_conf.h obj_line.h librnd/core/event.h macro.h \ + ../src_plugins/djopt/djopt_conf.h obj_line.h librnd/core/event.h \ obj_pstk_inlines.h data.h thermal.h librnd/poly/polygon1_gen.h \ ../src_plugins/djopt/djopt_conf_fields.h ../src_plugins/draw_csect/draw_csect.o: \ @@ -1569,7 +1569,7 @@ ../src_3rd/puplug/error.h stub_draw.h draw.h \ ../src_plugins/draw_fab/draw_fab_conf.h librnd/core/conf.h \ librnd/core/pcb-printf.h ../src_3rd/liblihata/lihata.h \ - librnd/core/list_conf.h conf_core.h librnd/core/hidlib_conf.h macro.h \ + librnd/core/list_conf.h conf_core.h librnd/core/hidlib_conf.h \ obj_pstk_inlines.h data.h thermal.h librnd/poly/polygon1_gen.h \ librnd/core/hid_inlines.h funchash_core.h librnd/core/funchash.h \ funchash_core_list.h obj_text_draw.h \ @@ -1698,7 +1698,7 @@ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \ librnd/core/compat_misc.h librnd/core/safe_fs.h librnd/core/hid_nogui.h \ - librnd/core/hid_attrib.h hid_cam.h librnd/core/hid_init.h macro.h + librnd/core/hid_attrib.h hid_cam.h librnd/core/hid_init.h ../src_plugins/export_dsn/dsn.o: ../src_plugins/export_dsn/dsn.c \ ../config.h librnd/config.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -1905,7 +1905,7 @@ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/error.h hid_cam.h librnd/core/hid_attrib.h \ librnd/core/compat_misc.h librnd/core/safe_fs.h librnd/core/conf.h \ - ../src_3rd/liblihata/lihata.h librnd/core/list_conf.h macro.h \ + ../src_3rd/liblihata/lihata.h librnd/core/list_conf.h \ funchash_core.h librnd/core/funchash.h funchash_core_list.h \ ../src_plugins/export_gerber/gerber_conf.h librnd/core/event.h \ librnd/core/hid_nogui.h librnd/core/hid_init.h librnd/core/hid_inlines.h \ @@ -2009,7 +2009,7 @@ librnd/core/plugins.h ../src_3rd/puplug/puplug.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \ - ../src_3rd/puplug/error.h plug_io.h librnd/core/safe_fs.h find.h macro.h \ + ../src_3rd/puplug/error.h plug_io.h librnd/core/safe_fs.h find.h \ obj_subc_parent.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \ funchash_core.h librnd/core/funchash.h funchash_core_list.h search.h \ librnd/core/hid_init.h librnd/core/hid_attrib.h @@ -2443,7 +2443,7 @@ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/error.h librnd/core/compat_misc.h obj_pstk_inlines.h \ thermal.h librnd/poly/polygon1_gen.h obj_subc_op.h operation.h layer.h \ - netlist.h librnd/core/safe_fs.h macro.h operation.h \ + netlist.h librnd/core/safe_fs.h operation.h \ ../src_plugins/export_xy/xy_conf.h librnd/core/hid_nogui.h \ librnd/core/hid_attrib.h hid_cam.h librnd/core/hid_init.h \ ../src_plugins/lib_compat_help/elem_rot.h \ @@ -2616,7 +2616,7 @@ vtlibrary.h data.h librnd/core/conf.h librnd/core/pcb-printf.h \ ../src_3rd/liblihata/lihata.h librnd/core/list_conf.h \ librnd/core/compat_fs.h librnd/core/compat_misc.h conf_core.h \ - librnd/core/hid_init.h macro.h librnd/core/safe_fs.h \ + librnd/core/hid_init.h librnd/core/safe_fs.h \ librnd/core/safe_fs_dir.h ../src_plugins/fp_wget/edakrill.o: ../src_plugins/fp_wget/edakrill.c \ ../config.h librnd/config.h ../src_3rd/genvector/gds_char.h \ @@ -3039,7 +3039,7 @@ librnd/core/event.h librnd/core/plugins.h ../src_3rd/puplug/puplug.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \ - ../src_3rd/puplug/error.h macro.h librnd/core/safe_fs.h funchash_core.h \ + ../src_3rd/puplug/error.h librnd/core/safe_fs.h funchash_core.h \ librnd/core/funchash.h funchash_core_list.h librnd/core/hid_nogui.h \ librnd/core/hid_cfg.h ../src_plugins/hid_lesstif/lesstif.h \ librnd/core/hid_cfg_input.h board.h vtroutestyle.h rats_patch.h board.h \ @@ -3552,7 +3552,7 @@ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h rats_patch.h \ librnd/core/compat_misc.h librnd/core/paths.h librnd/core/safe_fs.h \ - macro.h netlist.h + netlist.h ../src_plugins/import_pxm_gd/import_pxm_gd.o: \ ../src_plugins/import_pxm_gd/import_pxm_gd.c ../config.h librnd/config.h \ librnd/core/plugins.h ../src_3rd/puplug/puplug.h \ @@ -3743,7 +3743,7 @@ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \ ../src_plugins/io_autotrax/read.h layer.h polygon.h conf_core.h move.h \ - macro.h librnd/core/safe_fs.h rotate.h librnd/core/rotate.h \ + librnd/core/safe_fs.h rotate.h librnd/core/rotate.h \ librnd/core/actions.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \ ../src_plugins/lib_compat_help/pstk_help.h \ @@ -4160,7 +4160,7 @@ ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h vtpadstack.h \ obj_pstk_shape.h polygon.h vtpadstack_t.h ../src_plugins/io_kicad/read.h \ layer.h polygon.h plug_footprint.h vtlibrary.h data.h conf_core.h move.h \ - macro.h rotate.h librnd/core/rotate.h librnd/core/safe_fs.h netlist.h \ + rotate.h librnd/core/rotate.h librnd/core/safe_fs.h netlist.h \ obj_pstk_inlines.h thermal.h librnd/poly/polygon1_gen.h \ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \ ../src_plugins/lib_compat_help/pstk_help.h \ @@ -4289,7 +4289,7 @@ librnd/poly/rtree.h ../src_3rd/genrtree/genrtree_api.h ht_subc.h \ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \ - ../src_plugins/io_kicad_legacy/write.h layer.h netlist.h macro.h \ + ../src_plugins/io_kicad_legacy/write.h layer.h netlist.h \ obj_pstk_inlines.h data.h thermal.h librnd/poly/polygon1_gen.h \ ../src_plugins/io_kicad_legacy/../io_kicad/uniq_name.h \ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h @@ -4315,7 +4315,7 @@ librnd/poly/rtree.h ../src_3rd/genrtree/genrtree_api.h ht_subc.h \ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \ - vtpadstack_t.h macro.h ../src_plugins/io_lihata/common.h thermal.h \ + vtpadstack_t.h ../src_plugins/io_lihata/common.h thermal.h \ librnd/poly/polygon1_gen.h ../src_plugins/io_lihata/io_lihata.o: \ ../src_plugins/io_lihata/io_lihata.c ../config.h librnd/config.h \ @@ -4364,7 +4364,7 @@ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/error.h plug_io.h librnd/core/conf.h \ librnd/core/pcb-printf.h ../src_3rd/liblihata/lihata.h \ - librnd/core/list_conf.h flag_str.h librnd/core/compat_misc.h macro.h \ + librnd/core/list_conf.h flag_str.h librnd/core/compat_misc.h \ layer.h ../src_plugins/io_lihata/common.h polygon.h conf_core.h \ obj_subc.h pcb_minuid.h thermal.h librnd/poly/polygon1_gen.h \ ../src_plugins/io_lihata/io_lihata.h ../src_plugins/io_lihata/lht_conf.h \ @@ -4403,7 +4403,7 @@ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h plug_io.h flag_str.h \ - librnd/core/compat_misc.h rats_patch.h librnd/core/actions.h macro.h \ + librnd/core/compat_misc.h rats_patch.h librnd/core/actions.h \ layer.h ../src_plugins/io_lihata/common.h \ ../src_plugins/io_lihata/write_style.h ../src_3rd/liblhtpers/lhtpers.h \ ../src_plugins/io_lihata/io_lihata.h ../src_plugins/io_lihata/lht_conf.h \ @@ -4521,7 +4521,7 @@ librnd/poly/polygon1_gen.h remove.h flag_str.h librnd/core/compat_fs.h \ librnd/core/compat_misc.h librnd/core/paths.h rats_patch.h \ librnd/core/actions.h ../src_plugins/io_pcb/attribs.h route_style.h \ - obj_poly.h thermal.h librnd/core/event.h macro.h funchash_core.h \ + obj_poly.h thermal.h librnd/core/event.h funchash_core.h \ librnd/core/funchash.h funchash_core_list.h netlist.h \ ../src_plugins/lib_compat_help/layer_compat.h \ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \ @@ -4580,7 +4580,7 @@ ../src_plugins/io_pcb/parse_y.h plug_footprint.h vtlibrary.h data.h \ ../src_plugins/io_pcb/attribs.h librnd/core/compat_misc.h \ librnd/core/compat_cc.h obj_common.h librnd/core/paths.h \ - librnd/core/safe_fs.h macro.h + librnd/core/safe_fs.h ../src_plugins/io_pcb/parse_y.o: ../src_plugins/io_pcb/parse_y.c \ ../config.h librnd/config.h flag.h librnd/core/globalconst.h board.h \ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \ @@ -4913,7 +4913,7 @@ ../src_plugins/lib_compat_help/subc_help.c \ ../src_plugins/lib_compat_help/subc_help.h obj_subc.h \ ../src_plugins/lib_compat_help/elem_rot.c \ - ../src_plugins/lib_compat_help/elem_rot.h conf_core.h data_it.h macro.h + ../src_plugins/lib_compat_help/elem_rot.h conf_core.h data_it.h ../src_plugins/lib_compat_help/media.o: \ ../src_plugins/lib_compat_help/media.c ../config.h librnd/config.h \ librnd/core/unit.h librnd/core/global_typedefs.h librnd/core/pcb_bool.h \ @@ -6267,7 +6267,7 @@ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h librnd/core/actions.h \ - plug_footprint.h vtlibrary.h data.h obj_subc.h macro.h \ + plug_footprint.h vtlibrary.h data.h obj_subc.h \ librnd/core/compat_misc.h netlist.h ../src_plugins/order/order.o: ../src_plugins/order/order.c ../config.h \ librnd/config.h librnd/core/actions.h librnd/core/hid.h \ @@ -6357,7 +6357,7 @@ librnd/poly/rtree.h ../src_3rd/genrtree/genrtree_api.h ht_subc.h \ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \ - vtpadstack_t.h macro.h remove.h polygon.h flag_str.h find.h draw.h \ + vtpadstack_t.h remove.h polygon.h flag_str.h find.h draw.h \ undo.h ../src_3rd/libuundo/uundo.h undo_old.h librnd/core/plugins.h \ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ @@ -6387,7 +6387,7 @@ librnd/poly/rtree.h ../src_3rd/genrtree/genrtree_api.h ht_subc.h \ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \ - vtpadstack_t.h macro.h remove.h draw.h polygon.h librnd/core/plugins.h \ + vtpadstack_t.h remove.h draw.h polygon.h librnd/core/plugins.h \ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h librnd/core/actions.h \ @@ -6655,7 +6655,7 @@ ../src_plugins/query/query_y.h ../src_plugins/query/query_exec.h \ ../src_plugins/query/query_access.h draw.h layer.h select.h operation.h \ board.h vtroutestyle.h layer_grp.h rats_patch.h board.h \ - librnd/core/hidlib.h macro.h idpath.h librnd/core/compat_misc.h + librnd/core/hidlib.h idpath.h librnd/core/compat_misc.h ../src_plugins/query/query_exec.o: ../src_plugins/query/query_exec.c \ ../config.h librnd/config.h data.h librnd/core/globalconst.h \ librnd/core/global_typedefs.h librnd/core/pcb_bool.h layer.h \ @@ -6747,7 +6747,7 @@ ../src_3rd/puplug/error.h librnd/core/actions.h conf_core.h \ librnd/core/conf.h librnd/core/pcb-printf.h \ ../src_3rd/liblihata/lihata.h librnd/core/list_conf.h \ - librnd/core/compat_misc.h netlist.h librnd/core/safe_fs.h macro.h + librnd/core/compat_misc.h netlist.h librnd/core/safe_fs.h ../src_plugins/renumber/renumberblock.o: \ ../src_plugins/renumber/renumberblock.c ../config.h librnd/config.h \ board.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \ @@ -6798,7 +6798,7 @@ librnd/poly/rtree.h ../src_3rd/genrtree/genrtree_api.h ht_subc.h \ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \ - vtpadstack_t.h ../src_plugins/report/drill.h macro.h obj_pstk_inlines.h \ + vtpadstack_t.h ../src_plugins/report/drill.h obj_pstk_inlines.h \ board.h vtroutestyle.h rats_patch.h librnd/core/hidlib.h data.h \ thermal.h librnd/poly/polygon1_gen.h ../src_plugins/report/report.o: ../src_plugins/report/report.c \ @@ -6828,7 +6828,7 @@ librnd/poly/rtree.h ../src_3rd/genrtree/genrtree_api.h ht_subc.h \ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_it.h data.h \ - ../src_plugins/report/drill.h search.h flag_str.h macro.h undo.h \ + ../src_plugins/report/drill.h search.h flag_str.h undo.h \ ../src_3rd/libuundo/uundo.h undo_old.h find.h draw.h \ librnd/core/plugins.h ../src_3rd/puplug/puplug.h \ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \ @@ -6962,7 +6962,7 @@ librnd/poly/rtree.h ../src_3rd/genrtree/genrtree_api.h ht_subc.h \ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_it.h data.h \ - search.h tool.h flag_str.h macro.h undo.h ../src_3rd/libuundo/uundo.h \ + search.h tool.h flag_str.h undo.h ../src_3rd/libuundo/uundo.h \ undo_old.h find.h draw.h draw_wireframe.h librnd/core/plugins.h \ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ @@ -7313,7 +7313,7 @@ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h librnd/core/actions.h \ librnd/core/hid_cfg.h ../src_plugins/vendordrill/vendor_conf.h \ librnd/core/compat_misc.h obj_pstk_inlines.h data.h thermal.h \ - librnd/poly/polygon1_gen.h librnd/core/event.h macro.h \ + librnd/poly/polygon1_gen.h librnd/core/event.h \ ../src_3rd/liblihata/tree.h \ ../src_plugins/vendordrill/vendor_conf_fields.h ../src_3rd/gensexpr/gsx_parse.o: ../src_3rd/gensexpr/gsx_parse.c \ @@ -7628,7 +7628,7 @@ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h select.h \ operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \ - librnd/core/actions.h macro.h obj_pstk_op.h obj_subc_parent.h obj_term.h \ + librnd/core/actions.h obj_pstk_op.h obj_subc_parent.h obj_term.h \ obj_arc_op.h obj_line_op.h obj_poly_op.h obj_text_op.h obj_subc_op.h \ extobj.h change_act.o: change_act.c ../config.h librnd/config.h conf_core.h \ @@ -7659,7 +7659,7 @@ rats_patch.h librnd/core/hidlib.h librnd/core/actions.h change.h draw.h \ search.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \ librnd/core/event.h librnd/core/compat_misc.h obj_rat_draw.h data_it.h \ - macro.h librnd/core/grid.h route_style.h librnd/core/hidlib_conf.h + librnd/core/grid.h route_style.h librnd/core/hidlib_conf.h conf_act.o: conf_act.c ../config.h librnd/config.h board.h \ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \ librnd/core/global_typedefs.h librnd/core/pcb_bool.h vtroutestyle.h \ @@ -7681,7 +7681,7 @@ librnd/core/conf.h librnd/core/pcb-printf.h \ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \ librnd/core/list_conf.h librnd/core/hidlib_conf.h funchash_core.h \ - librnd/core/funchash.h funchash_core_list.h route_style.h tool.h macro.h + librnd/core/funchash.h funchash_core_list.h route_style.h tool.h conf_core.o: conf_core.c ../config.h librnd/config.h librnd/core/conf.h \ librnd/core/global_typedefs.h librnd/core/pcb_bool.h \ librnd/core/pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -7727,7 +7727,7 @@ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h \ draw_wireframe.h search.h librnd/core/actions.h \ librnd/core/hid_inlines.h librnd/core/compat_misc.h find.h undo.h \ - ../src_3rd/libuundo/uundo.h undo_old.h librnd/core/event.h macro.h \ + ../src_3rd/libuundo/uundo.h undo_old.h librnd/core/event.h \ librnd/core/grid.h stub_stroke.h obj_line_draw.h obj_arc_draw.h \ obj_text_draw.h obj_pstk_draw.h route_draw.h obj_arc_ui.h \ obj_subc_parent.h tool.h @@ -7921,7 +7921,7 @@ librnd/poly/rtree.h ../src_3rd/genrtree/genrtree_api.h ht_subc.h \ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h find_geo.c \ - macro.h obj_arc_ui.h obj_pstk_inlines.h board.h vtroutestyle.h \ + obj_arc_ui.h obj_pstk_inlines.h board.h vtroutestyle.h \ rats_patch.h librnd/core/hidlib.h thermal.h librnd/poly/polygon1_gen.h \ search.h find_any_isect.c flag.o: flag.c ../config.h librnd/config.h flag.h \ @@ -7930,7 +7930,7 @@ flag_str.o: flag_str.c ../config.h librnd/config.h flag_str.h flag.h \ librnd/core/globalconst.h librnd/core/compat_misc.h obj_common.h \ librnd/core/attrib.h librnd/core/global_typedefs.h \ - librnd/core/pcb_bool.h data_parent.h macro.h + librnd/core/pcb_bool.h data_parent.h font.o: font.c ../config.h librnd/config.h ../src_3rd/genht/hash.h font.h \ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h \ librnd/core/global_typedefs.h librnd/core/pcb_bool.h obj_poly.h \ @@ -8519,7 +8519,7 @@ librnd/poly/rtree2_compat.h librnd/poly/rtree.h \ ../src_3rd/genrtree/genrtree_api.h ht_subc.h ../src_3rd/genht/ht.h \ ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h vtpadstack.h \ - obj_pstk_shape.h polygon.h vtpadstack_t.h find.h macro.h + obj_pstk_shape.h polygon.h vtpadstack_t.h find.h obj_line_list.o: obj_line_list.c obj_line_list.h obj_line.h \ ../src_3rd/genlist/gendlist.h obj_common.h flag.h \ librnd/core/globalconst.h librnd/config.h librnd/core/attrib.h \ @@ -8744,7 +8744,7 @@ obj_subc_parent.h obj_poly_op.h obj_pstk_inlines.h thermal.h \ librnd/poly/polygon1_gen.h obj_pstk_draw.h draw.h obj_line_op.h \ obj_term.h obj_text_draw.h draw_wireframe.h undo.h \ - ../src_3rd/libuundo/uundo.h undo_old.h macro.h librnd/core/compat_misc.h \ + ../src_3rd/libuundo/uundo.h undo_old.h librnd/core/compat_misc.h \ pcb_minuid.h conf_core.h librnd/core/conf.h librnd/core/pcb-printf.h \ ../src_3rd/liblihata/lihata.h librnd/core/list_conf.h \ librnd/core/hidlib_conf.h librnd/core/hid_inlines.h extobj.h @@ -8811,7 +8811,7 @@ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \ librnd/core/pcb-printf.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \ - macro.h + obj_text.o: obj_text.c ../config.h librnd/config.h rotate.h \ librnd/core/rotate.h librnd/core/global_typedefs.h \ librnd/core/pcb_bool.h librnd/core/compat_misc.h board.h \ @@ -8882,7 +8882,7 @@ ../src_3rd/libuundo/uundo.h undo_old.h librnd/core/event.h \ funchash_core.h librnd/core/funchash.h funchash_core_list.h search.h \ draw.h move.h remove.h librnd/core/compat_misc.h layer_vis.h operation.h \ - macro.h rotate.h librnd/core/rotate.h librnd/core/actions.h + rotate.h librnd/core/rotate.h librnd/core/actions.h operation.o: operation.c ../config.h librnd/config.h operation.h \ librnd/core/global_typedefs.h librnd/core/pcb_bool.h board.h \ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h vtroutestyle.h \ @@ -9018,7 +9018,7 @@ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h librnd/core/event.h \ librnd/core/compat_misc.h route_style.h librnd/core/compat_fs.h \ librnd/core/compat_lrealpath.h layer_vis.h librnd/core/safe_fs.h \ - plug_footprint.h vtlibrary.h librnd/core/file_loaded.h macro.h view.h + plug_footprint.h vtlibrary.h librnd/core/file_loaded.h view.h polygon.o: polygon.c ../config.h librnd/config.h conf_core.h \ librnd/core/conf.h librnd/core/global_typedefs.h librnd/core/pcb_bool.h \ librnd/core/pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -9129,7 +9129,7 @@ librnd/core/pcb-printf.h ../src_3rd/liblihata/lihata.h \ librnd/core/list_conf.h funchash_core.h librnd/core/funchash.h \ funchash_core_list.h search.h undo.h ../src_3rd/libuundo/uundo.h \ - undo_old.h conf_core.h netlist.h macro.h + undo_old.h conf_core.h netlist.h remove.o: remove.c ../config.h librnd/config.h conf_core.h \ librnd/core/conf.h librnd/core/global_typedefs.h librnd/core/pcb_bool.h \ librnd/core/pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -9444,7 +9444,7 @@ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h \ draw_wireframe.h search.h tool.h undo.h ../src_3rd/libuundo/uundo.h \ - undo_old.h macro.h obj_arc_draw.h + undo_old.h obj_arc_draw.h tool_arrow.o: tool_arrow.c ../config.h librnd/config.h conf_core.h \ librnd/core/conf.h librnd/core/global_typedefs.h librnd/core/pcb_bool.h \ librnd/core/pcb-printf.h ../src_3rd/genvector/gds_char.h \ Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 29291) +++ trunk/src/change.c (revision 29292) @@ -39,7 +39,6 @@ #include "select.h" #include "undo.h" #include -#include "macro.h" #include "obj_pstk_op.h" #include "obj_subc_parent.h" #include "obj_term.h" Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 29291) +++ trunk/src/change_act.c (revision 29292) @@ -48,7 +48,6 @@ #include #include "obj_rat_draw.h" #include "data_it.h" -#include "macro.h" #include #include "route_style.h" #include Index: trunk/src/conf_act.c =================================================================== --- trunk/src/conf_act.c (revision 29291) +++ trunk/src/conf_act.c (revision 29292) @@ -33,7 +33,6 @@ #include "route_style.h" #include #include "tool.h" -#include "macro.h" static const char pcb_acts_Conf[] = "conf(set, path, value, [role], [policy]) - change a config setting to an absolute value\n" Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 29291) +++ trunk/src/crosshair.c (revision 29292) @@ -46,7 +46,6 @@ #include "find.h" #include "undo.h" #include -#include "macro.h" #include #include "stub_stroke.h" Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 29291) +++ trunk/src/find_geo.c (revision 29292) @@ -42,7 +42,6 @@ * - see the description of 'pcb_isc_line_line()' */ -#include "macro.h" #include "obj_arc_ui.h" #include "obj_pstk_inlines.h" #include "search.h" Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 29291) +++ trunk/src/flag_str.c (revision 29292) @@ -40,8 +40,8 @@ #include "flag_str.h" #include +#include #include "obj_common.h" -#include "macro.h" /* Because the common flag access macros expect an object struct to work on. */ typedef struct { Index: trunk/src/librnd/core/funchash.c =================================================================== --- trunk/src/librnd/core/funchash.c (revision 29291) +++ trunk/src/librnd/core/funchash.c (revision 29292) @@ -31,8 +31,8 @@ #include #include "funchash_core.h" #include -#include "macro.h" #include +#include #define action_entry(x) { #x, F_ ## x}, static pcb_funchash_table_t Functions[] = { Index: trunk/src/librnd/core/hid_attrib.c =================================================================== --- trunk/src/librnd/core/hid_attrib.c (revision 29291) +++ trunk/src/librnd/core/hid_attrib.c (revision 29292) @@ -32,7 +32,6 @@ #include #include #include -#include "macro.h" pcb_hid_attr_node_t *hid_attr_nodes = 0; Index: trunk/src/librnd/core/misc_util.h =================================================================== --- trunk/src/librnd/core/misc_util.h (revision 29291) +++ trunk/src/librnd/core/misc_util.h (revision 29292) @@ -69,4 +69,11 @@ /* remove leading and trailing whitespace */ char *pcb_str_strip(char *s); +#define PCB_ENTRIES(x) (sizeof((x))/sizeof((x)[0])) +#define PCB_UNKNOWN(a) ((a) && *(a) ? (a) : "(unknown)") +#define PCB_NSTRCMP(a, b) ((a) ? ((b) ? strcmp((a),(b)) : 1) : -1) +#define PCB_EMPTY(a) ((a) ? (a) : "") +#define PCB_EMPTY_STRING_P(a) ((a) ? (a)[0]==0 : 1) +#define PCB_XOR(a,b) (((a) && !(b)) || (!(a) && (b))) + #endif Index: trunk/src/librnd/poly/polyarea.c =================================================================== --- trunk/src/librnd/poly/polyarea.c (revision 29291) +++ trunk/src/librnd/poly/polyarea.c (revision 29292) @@ -53,7 +53,6 @@ #include #include #include "obj_common.h" -#include "macro.h" #include #include Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 29291) +++ trunk/src/obj_line_drcenf.c (revision 29292) @@ -38,7 +38,6 @@ #include "data.h" #include "find.h" #include -#include "macro.h" void pcb_line_adjust_attached(void) { Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 29291) +++ trunk/src/obj_subc.c (revision 29292) @@ -51,7 +51,6 @@ #include "polygon.h" #include "operation.h" #include "undo.h" -#include "macro.h" #include #include #include "pcb_minuid.h" Index: trunk/src/obj_term.c =================================================================== --- trunk/src/obj_term.c (revision 29291) +++ trunk/src/obj_term.c (revision 29292) @@ -38,7 +38,6 @@ #include "obj_subc_parent.h" #include #include "undo.h" -#include "macro.h" #include "polygon.h" static const char core_term_cookie[] = "core-term"; Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 29291) +++ trunk/src/object_act.c (revision 29292) @@ -54,7 +54,6 @@ #include "layer_vis.h" #include "operation.h" #include "obj_pstk.h" -#include "macro.h" #include "rotate.h" #include Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 29291) +++ trunk/src/plug_io.c (revision 29292) @@ -69,7 +69,6 @@ #include #include "plug_footprint.h" #include -#include "macro.h" #include "view.h" pcb_plug_io_t *pcb_plug_io_chain = NULL; Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 29291) +++ trunk/src/rats_patch.c (revision 29292) @@ -43,7 +43,6 @@ #include "undo.h" #include "conf_core.h" #include "netlist.h" -#include "macro.h" static void rats_patch_remove(pcb_board_t *pcb, pcb_ratspatch_line_t * n, int do_free); Index: trunk/src/tool_arc.c =================================================================== --- trunk/src/tool_arc.c (revision 29291) +++ trunk/src/tool_arc.c (revision 29292) @@ -45,7 +45,6 @@ #include "search.h" #include "tool.h" #include "undo.h" -#include "macro.h" #include "obj_arc_draw.h" Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 29291) +++ trunk/src_plugins/autoplace/autoplace.c (revision 29292) @@ -58,7 +58,6 @@ #include "layer.h" #include "intersect.h" #include -#include "macro.h" #include "move.h" #include "netlist.h" #include "remove.h" Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 29291) +++ trunk/src_plugins/autoroute/autoroute.c (revision 29292) @@ -66,7 +66,6 @@ #include #include "data.h" -#include "macro.h" #include "autoroute.h" #include #include "draw.h" Index: trunk/src_plugins/autoroute/vector.c =================================================================== --- trunk/src_plugins/autoroute/vector.c (revision 29291) +++ trunk/src_plugins/autoroute/vector.c (revision 29292) @@ -45,7 +45,6 @@ #include #include "vector.h" -#include "macro.h" struct vector_struct { vector_element_t *element; Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 29291) +++ trunk/src_plugins/diag/diag.c (revision 29292) @@ -44,7 +44,6 @@ #include #include #include "search.h" -#include "macro.h" #include "plug_footprint.h" #include "plug_io.h" #include "funchash_core.h" Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 29291) +++ trunk/src_plugins/distalign/distalign.c (revision 29292) @@ -27,7 +27,6 @@ #include "move.h" #include "draw.h" #include -#include "macro.h" #include #include Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 29291) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 29292) @@ -33,7 +33,6 @@ #include #include "conf_core.h" #include -#include "macro.h" #include enum { Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 29291) +++ trunk/src_plugins/djopt/djopt.c (revision 29292) @@ -55,7 +55,6 @@ #include "djopt_conf.h" #include "obj_line.h" #include -#include "macro.h" #include "obj_pstk_inlines.h" conf_djopt_t conf_djopt; Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 29291) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 29292) @@ -42,7 +42,6 @@ #include "draw_fab_conf.h" #include "conf_core.h" #include -#include "macro.h" #include "obj_pstk_inlines.h" #include #include "funchash_core.h" Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 29291) +++ trunk/src_plugins/export_bom/bom.c (revision 29292) @@ -26,7 +26,6 @@ #include #include "hid_cam.h" #include -#include "macro.h" const char *bom_cookie = "bom HID"; Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 29291) +++ trunk/src_plugins/export_gerber/gerber.c (revision 29292) @@ -23,7 +23,6 @@ #include "hid_cam.h" #include #include -#include "macro.h" #include "funchash_core.h" #include "gerber_conf.h" #include Index: trunk/src_plugins/export_oldconn/oldconn.c =================================================================== --- trunk/src_plugins/export_oldconn/oldconn.c (revision 29291) +++ trunk/src_plugins/export_oldconn/oldconn.c (revision 29292) @@ -40,7 +40,6 @@ #include "plug_io.h" #include #include "find.h" -#include "macro.h" #include "obj_subc_parent.h" #include "undo.h" #include "funchash_core.h" Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 29291) +++ trunk/src_plugins/export_xy/xy.c (revision 29292) @@ -23,7 +23,6 @@ #include "layer.h" #include "netlist.h" #include -#include "macro.h" #include "operation.h" #include "xy_conf.h" Index: trunk/src_plugins/fp_fs/fp_fs.c =================================================================== --- trunk/src_plugins/fp_fs/fp_fs.c (revision 29291) +++ trunk/src_plugins/fp_fs/fp_fs.c (revision 29292) @@ -45,7 +45,6 @@ #include #include "conf_core.h" #include -#include "macro.h" #include #include Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 29291) +++ trunk/src_plugins/hid_lesstif/main.c (revision 29292) @@ -28,7 +28,6 @@ #include #include #include -#include "macro.h" #include #include "funchash_core.h" Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 29291) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 29292) @@ -41,7 +41,6 @@ #include #include #include -#include "macro.h" #include "netlist.h" static pcb_plug_import_t import_netlist; Index: trunk/src_plugins/io_autotrax/read.c =================================================================== --- trunk/src_plugins/io_autotrax/read.c (revision 29291) +++ trunk/src_plugins/io_autotrax/read.c (revision 29292) @@ -44,7 +44,6 @@ #include /* for distance calculations */ #include "conf_core.h" #include "move.h" -#include "macro.h" #include #include "rotate.h" #include Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 29291) +++ trunk/src_plugins/io_kicad/read.c (revision 29292) @@ -48,7 +48,6 @@ #include /* for distance calculations */ #include "conf_core.h" #include "move.h" -#include "macro.h" #include "rotate.h" #include #include Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 29291) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 29292) @@ -35,7 +35,6 @@ #include "write.h" #include "layer.h" #include "netlist.h" -#include "macro.h" #include "obj_pstk_inlines.h" #include "../io_kicad/uniq_name.h" Index: trunk/src_plugins/io_lihata/common.c =================================================================== --- trunk/src_plugins/io_lihata/common.c (revision 29291) +++ trunk/src_plugins/io_lihata/common.c (revision 29292) @@ -30,7 +30,6 @@ #include #include "config.h" #include "data.h" -#include "macro.h" #include "common.h" #include "thermal.h" Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 29291) +++ trunk/src_plugins/io_lihata/read.c (revision 29292) @@ -40,7 +40,6 @@ #include "plug_io.h" #include "flag_str.h" #include -#include "macro.h" #include #include #include "layer.h" Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 29291) +++ trunk/src_plugins/io_lihata/write.c (revision 29292) @@ -42,7 +42,6 @@ #include "rats_patch.h" #include #include -#include "macro.h" #include "layer.h" #include "common.h" #include "write_style.h" Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 29291) +++ trunk/src_plugins/io_pcb/file.c (revision 29292) @@ -67,7 +67,6 @@ #include "obj_poly.h" #include "thermal.h" #include -#include "macro.h" #include "funchash_core.h" #include "netlist.h" Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 29291) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 29292) @@ -927,7 +927,6 @@ #include "obj_common.h" #include #include -#include "macro.h" #define YY_NO_INPUT @@ -962,8 +961,8 @@ static int Parse(FILE *Pipe, const char *Executable, const char *Path, const char *Filename); +#line 965 "parse_l.c" #line 966 "parse_l.c" -#line 967 "parse_l.c" #define INITIAL 0 @@ -1180,10 +1179,10 @@ } { -#line 108 "parse_l.l" +#line 107 "parse_l.l" -#line 1187 "parse_l.c" +#line 1186 "parse_l.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1252,227 +1251,227 @@ case 1: YY_RULE_SETUP -#line 110 "parse_l.l" +#line 109 "parse_l.l" { return(T_FILEVERSION); } YY_BREAK case 2: YY_RULE_SETUP -#line 111 "parse_l.l" +#line 110 "parse_l.l" { return(T_PCB); } YY_BREAK case 3: YY_RULE_SETUP -#line 112 "parse_l.l" +#line 111 "parse_l.l" { return(T_GRID); } YY_BREAK case 4: YY_RULE_SETUP -#line 113 "parse_l.l" +#line 112 "parse_l.l" { return(T_CURSOR); } YY_BREAK case 5: YY_RULE_SETUP -#line 114 "parse_l.l" +#line 113 "parse_l.l" { return(T_THERMAL); } YY_BREAK case 6: YY_RULE_SETUP -#line 115 "parse_l.l" +#line 114 "parse_l.l" { return(T_AREA); } YY_BREAK case 7: YY_RULE_SETUP -#line 116 "parse_l.l" +#line 115 "parse_l.l" { return(T_DRC); } YY_BREAK case 8: YY_RULE_SETUP -#line 117 "parse_l.l" +#line 116 "parse_l.l" { return(T_FLAGS); } YY_BREAK case 9: YY_RULE_SETUP -#line 118 "parse_l.l" +#line 117 "parse_l.l" { return(T_LAYER); } YY_BREAK case 10: YY_RULE_SETUP -#line 119 "parse_l.l" +#line 118 "parse_l.l" { return(T_PIN); } YY_BREAK case 11: YY_RULE_SETUP -#line 120 "parse_l.l" +#line 119 "parse_l.l" { return(T_PAD); } YY_BREAK case 12: YY_RULE_SETUP -#line 121 "parse_l.l" +#line 120 "parse_l.l" { return(T_VIA); } YY_BREAK case 13: YY_RULE_SETUP -#line 122 "parse_l.l" +#line 121 "parse_l.l" { return(T_LINE); } YY_BREAK case 14: YY_RULE_SETUP -#line 123 "parse_l.l" +#line 122 "parse_l.l" { return(T_RAT); } YY_BREAK case 15: YY_RULE_SETUP -#line 124 "parse_l.l" +#line 123 "parse_l.l" { return(T_RECTANGLE); } YY_BREAK case 16: YY_RULE_SETUP -#line 125 "parse_l.l" +#line 124 "parse_l.l" { return(T_TEXT); } YY_BREAK case 17: YY_RULE_SETUP -#line 126 "parse_l.l" +#line 125 "parse_l.l" { return(T_ELEMENTLINE); } YY_BREAK case 18: YY_RULE_SETUP -#line 127 "parse_l.l" +#line 126 "parse_l.l" { return(T_ELEMENTARC); } YY_BREAK case 19: YY_RULE_SETUP -#line 128 "parse_l.l" +#line 127 "parse_l.l" { return(T_ELEMENT); } YY_BREAK case 20: YY_RULE_SETUP -#line 129 "parse_l.l" +#line 128 "parse_l.l" { return(T_SYMBOLLINE); } YY_BREAK case 21: YY_RULE_SETUP -#line 130 "parse_l.l" +#line 129 "parse_l.l" { return(T_SYMBOL); } YY_BREAK case 22: YY_RULE_SETUP -#line 131 "parse_l.l" +#line 130 "parse_l.l" { return(T_MARK); } YY_BREAK case 23: YY_RULE_SETUP -#line 132 "parse_l.l" +#line 131 "parse_l.l" { return(T_GROUPS); } YY_BREAK case 24: YY_RULE_SETUP -#line 133 "parse_l.l" +#line 132 "parse_l.l" { return(T_STYLES); } YY_BREAK case 25: YY_RULE_SETUP -#line 134 "parse_l.l" +#line 133 "parse_l.l" { return(T_POLYGON); } YY_BREAK case 26: YY_RULE_SETUP -#line 135 "parse_l.l" +#line 134 "parse_l.l" { return(T_POLYGON_HOLE); } YY_BREAK case 27: YY_RULE_SETUP -#line 136 "parse_l.l" +#line 135 "parse_l.l" { return(T_ARC); } YY_BREAK case 28: YY_RULE_SETUP -#line 137 "parse_l.l" +#line 136 "parse_l.l" { return(T_NETLIST); } YY_BREAK case 29: YY_RULE_SETUP -#line 138 "parse_l.l" +#line 137 "parse_l.l" { return(T_NET); } YY_BREAK case 30: YY_RULE_SETUP -#line 139 "parse_l.l" +#line 138 "parse_l.l" { return(T_CONN); } YY_BREAK case 31: YY_RULE_SETUP -#line 140 "parse_l.l" +#line 139 "parse_l.l" { return(T_NETLISTPATCH); } YY_BREAK case 32: YY_RULE_SETUP -#line 141 "parse_l.l" +#line 140 "parse_l.l" { return(T_ADD_CONN); } YY_BREAK case 33: YY_RULE_SETUP -#line 142 "parse_l.l" +#line 141 "parse_l.l" { return(T_DEL_CONN); } YY_BREAK case 34: YY_RULE_SETUP -#line 143 "parse_l.l" +#line 142 "parse_l.l" { return(T_CHANGE_ATTRIB); } YY_BREAK case 35: YY_RULE_SETUP -#line 144 "parse_l.l" +#line 143 "parse_l.l" { return(T_ATTRIBUTE); } YY_BREAK case 36: YY_RULE_SETUP -#line 146 "parse_l.l" +#line 145 "parse_l.l" { return T_NM; } YY_BREAK case 37: YY_RULE_SETUP -#line 147 "parse_l.l" +#line 146 "parse_l.l" { return T_UM; } YY_BREAK case 38: YY_RULE_SETUP -#line 148 "parse_l.l" +#line 147 "parse_l.l" { return T_MM; } YY_BREAK case 39: YY_RULE_SETUP -#line 149 "parse_l.l" +#line 148 "parse_l.l" { return T_M; } YY_BREAK case 40: YY_RULE_SETUP -#line 150 "parse_l.l" +#line 149 "parse_l.l" { return T_KM; } YY_BREAK case 41: YY_RULE_SETUP -#line 151 "parse_l.l" +#line 150 "parse_l.l" { return T_UMIL; } YY_BREAK case 42: YY_RULE_SETUP -#line 152 "parse_l.l" +#line 151 "parse_l.l" { return T_CMIL; } YY_BREAK case 43: YY_RULE_SETUP -#line 153 "parse_l.l" +#line 152 "parse_l.l" { return T_MIL; } YY_BREAK case 44: YY_RULE_SETUP -#line 154 "parse_l.l" +#line 153 "parse_l.l" { return T_IN; } YY_BREAK case 45: YY_RULE_SETUP -#line 156 "parse_l.l" +#line 155 "parse_l.l" { pcb_lval.integer = (unsigned) *(yytext+1); return(CHAR_CONST); @@ -1480,17 +1479,17 @@ YY_BREAK case 46: YY_RULE_SETUP -#line 160 "parse_l.l" +#line 159 "parse_l.l" { return parse_number(); } YY_BREAK case 47: YY_RULE_SETUP -#line 161 "parse_l.l" +#line 160 "parse_l.l" { pcb_lval.integer = pcb_round (strtod (yytext, NULL)); return INTEGER; } YY_BREAK case 48: YY_RULE_SETUP -#line 163 "parse_l.l" +#line 162 "parse_l.l" { unsigned n; sscanf((char *) yytext, "%x", &n); pcb_lval.integer = n; @@ -1499,7 +1498,7 @@ YY_BREAK case 49: YY_RULE_SETUP -#line 168 "parse_l.l" +#line 167 "parse_l.l" { char *p1, *p2; @@ -1535,23 +1534,23 @@ YY_BREAK case 50: YY_RULE_SETUP -#line 200 "parse_l.l" +#line 199 "parse_l.l" { if (yy_parse_tags) { add_tag(yytext); }} YY_BREAK case 51: YY_RULE_SETUP -#line 201 "parse_l.l" +#line 200 "parse_l.l" {} YY_BREAK case 52: YY_RULE_SETUP -#line 202 "parse_l.l" +#line 201 "parse_l.l" {} YY_BREAK case 53: /* rule 53 can match eol */ YY_RULE_SETUP -#line 203 "parse_l.l" +#line 202 "parse_l.l" { #ifndef FLEX_SCANNER yylineno++; @@ -1560,20 +1559,20 @@ YY_BREAK case 54: YY_RULE_SETUP -#line 208 "parse_l.l" +#line 207 "parse_l.l" {} YY_BREAK case 55: YY_RULE_SETUP -#line 209 "parse_l.l" +#line 208 "parse_l.l" { return(*yytext); } YY_BREAK case 56: YY_RULE_SETUP -#line 211 "parse_l.l" +#line 210 "parse_l.l" ECHO; YY_BREAK -#line 1577 "parse_l.c" +#line 1576 "parse_l.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2590,7 +2589,7 @@ #define YYTABLES_NAME "yytables" -#line 211 "parse_l.l" +#line 210 "parse_l.l" /* sets up the preprocessor command */ Index: trunk/src_plugins/io_pcb/parse_l.h =================================================================== --- trunk/src_plugins/io_pcb/parse_l.h (revision 29291) +++ trunk/src_plugins/io_pcb/parse_l.h (revision 29292) @@ -700,7 +700,7 @@ #undef yyTABLES_NAME #endif -#line 211 "parse_l.l" +#line 210 "parse_l.l" #line 707 "parse_l.h" Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 29291) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 29292) @@ -58,7 +58,6 @@ #include "obj_common.h" #include #include -#include "macro.h" #define YY_NO_INPUT Index: trunk/src_plugins/lib_compat_help/elem_rot.c =================================================================== --- trunk/src_plugins/lib_compat_help/elem_rot.c (revision 29291) +++ trunk/src_plugins/lib_compat_help/elem_rot.c (revision 29292) @@ -32,7 +32,6 @@ #include "elem_rot.h" #include "conf_core.h" #include "data_it.h" -#include "macro.h" static const int verbose_rot = 0; Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 29291) +++ trunk/src_plugins/oldactions/oldactions.c (revision 29292) @@ -42,7 +42,6 @@ #include #include "plug_footprint.h" #include "obj_subc.h" -#include "macro.h" #include #include "netlist.h" Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 29291) +++ trunk/src_plugins/polycombine/polycombine.c (revision 29292) @@ -16,7 +16,6 @@ #include "config.h" #include "board.h" #include "data.h" -#include "macro.h" #include "remove.h" #include #include Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 29291) +++ trunk/src_plugins/polystitch/polystitch.c (revision 29292) @@ -18,7 +18,6 @@ #include "config.h" #include "board.h" #include "data.h" -#include "macro.h" #include "remove.h" #include #include Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 29291) +++ trunk/src_plugins/query/query_act.c (revision 29292) @@ -39,7 +39,6 @@ #include "draw.h" #include "select.h" #include "board.h" -#include "macro.h" #include "idpath.h" #include Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 29291) +++ trunk/src_plugins/renumber/renumber.c (revision 29292) @@ -44,7 +44,6 @@ #include #include "netlist.h" #include -#include "macro.h" #include Index: trunk/src_plugins/report/drill.c =================================================================== --- trunk/src_plugins/report/drill.c (revision 29291) +++ trunk/src_plugins/report/drill.c (revision 29292) @@ -33,7 +33,6 @@ #include "data.h" #include "drill.h" -#include "macro.h" #include "obj_pstk_inlines.h" #define STEP_ELEMENT 50 Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 29291) +++ trunk/src_plugins/report/report.c (revision 29292) @@ -49,7 +49,6 @@ #include "search.h" #include #include "flag_str.h" -#include "macro.h" #include "undo.h" #include "find.h" #include "draw.h" Index: trunk/src_plugins/serpentine/serpentine.c =================================================================== --- trunk/src_plugins/serpentine/serpentine.c (revision 29291) +++ trunk/src_plugins/serpentine/serpentine.c (revision 29292) @@ -38,7 +38,6 @@ #include "tool.h" #include #include "flag_str.h" -#include "macro.h" #include "undo.h" #include "find.h" #include "draw.h" Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 29291) +++ trunk/src_plugins/vendordrill/vendor.c (revision 29292) @@ -50,7 +50,6 @@ #include #include "obj_pstk_inlines.h" #include -#include "macro.h" #include #include